- {stable ? t("stable") : t("stabilizing")}
+ {scaleStatusText}
{(["kg", "g", "lb"] as Unit[]).map((item) => (
@@ -735,7 +995,7 @@ export default function Home() {
-
+
{lastAccumulation &&
}
@@ -761,18 +1021,18 @@ export default function Home() {
✓
{t("weighComplete")}
{t("dataSaved")}
-
{t("uploadQueue")}
+
{t(lastUploadPending ? "uploadQueue" : "uploadSuccess")}
{t("receipt")}{new Date(lastRecord?.createdAt ?? new Date()).toLocaleString(language, { hour12: false })}
- {materialName(selectedMaterial)}{formatWeight(displayedWeight, unit)} {unit}
+ {materialName(selectedMaterial)}{formatWeight(lastRecord?.weightKg ?? displayedWeight, unit)} {unit}
- {t("employeeName")}
- {employee.name}
- {t("employeeId")}
- {employee.id}
- {t("productionMachine")}
- {machine}
- {t("materialType")} ID
- {selectedMaterial.id}
- - {t("uploadStatus")}
- ● {t("saved")}
+ - {t("uploadStatus")}
- ● {t(lastUploadPending ? "pendingUpload" : "saved")}
@@ -841,23 +1101,30 @@ export default function Home() {
))}
+
+
{t("systemTools")}{t("systemToolsDesc")}
+
+
+
+
+
{t("serverApi")}{t("serverApiDesc")}
{[
- ["employee", t("employeeApi"), "http://192.168.1.20/api/employee"],
- ["machines", t("machineApi"), "http://192.168.1.20/api/machines"],
- ["weight", t("scaleApi"), "ws://192.168.1.21/weight"],
- ["upload", t("uploadApi"), "http://192.168.1.20/api/records"],
- ].map(([key, label, placeholder]) => (
+ ["employee", t("employeeApi")],
+ ["machines", t("machineApi")],
+ ["weight", t("scaleApi")],
+ ["upload", t("uploadApi")],
+ ].map(([key, label]) => (
))}
@@ -875,7 +1142,17 @@ export default function Home() {
{materialOptions.map((item, index) => (
-
+
0{index + 1}
))}
@@ -935,9 +1212,25 @@ export default function Home() {
8–12 位
-
-
-
+ {([
+ ["current", t("currentPassword")],
+ ["next", t("newPassword")],
+ ["confirm", t("confirmPassword")],
+ ] as [PasswordField, string][]).map(([field, label]) => (
+
+ ))}
@@ -975,23 +1268,43 @@ export default function Home() {
{passwordOpen && (
-
setPasswordOpen(false)}>
-
event.stopPropagation()}>
-
+
+
event.stopPropagation()}>
+
⌁
{t("passwordTitle")}
-
{t("passwordDesc")}
{t("initialPassword")}
-
setPassword(event.target.value.replace(/\D/g, ""))} onKeyDown={(event) => event.key === "Enter" && enterAdmin()} placeholder="••••••••" aria-label="管理员密码" />
+
{t("passwordDesc")}
+
+ {password ? "●".repeat(password.length) : t("numberInput")}
+
+
{ setPassword(value); setPasswordError(""); }} maxLength={12} clearLabel={t("numberClear")} deleteLabel={t("numberDelete")} />
{passwordError && {passwordError}}
)}
+ {numericEditor && (
+
setNumericEditor(null)}>
+
event.stopPropagation()}>
+
+
#
+
{numericEditor.title}
+
+ {numericEditorValue
+ ? numericEditor.kind === "password" ? "●".repeat(numericEditorValue.length) : numericEditorValue
+ : t("numberInput")}
+
+
+
+
+
+ )}
+
{machineModalOpen && (
-
setMachineModalOpen(false)}>
+
{ setMachineKeypadOpen(false); setMachineModalOpen(false); }}>
event.stopPropagation()}>
-
+
▣
{t("machineDialogTitle")}
{t("machineDialogDesc")}
@@ -999,25 +1312,39 @@ export default function Home() {
⌕
- setMachineQuery(event.target.value)} placeholder={t("searchMachine")} autoFocus />
+ setMachineKeypadOpen(true)}
+ onClick={() => setMachineKeypadOpen(true)}
+ />
-
- {filteredMachines.map((item) => (
-
- ))}
- {!filteredMachines.length &&
{t("noMachine")}
}
+
+ {machineKeypadOpen &&
}
+
+ {filteredMachines.map((item) => (
+
+ ))}
+ {!filteredMachines.length &&
{t("noMachine")}
}
+
-
+
)}
diff --git a/app/scale-utils.ts b/app/scale-utils.ts
new file mode 100644
index 0000000..21c270a
--- /dev/null
+++ b/app/scale-utils.ts
@@ -0,0 +1,97 @@
+export type WeightUnit = "kg" | "g" | "lb";
+
+const UNIT_FACTORS: Record
= {
+ kg: 1,
+ g: 1000,
+ lb: 2.20462262,
+};
+
+/**
+ * 将内部统一保存的千克值转换为界面单位，并固定显示两位小数。
+ */
+export function formatWeight(valueKg: number, unit: WeightUnit) {
+ const safeValue = Number.isFinite(valueKg) ? Math.max(0, valueKg) : 0;
+ return (safeValue * UNIT_FACTORS[unit]).toFixed(2);
+}
+
+/**
+ * 把 ISO 时间转换为终端文件名使用的本地时间格式：YYYYMMDDHHmmss。
+ */
+export function createFileTimestamp(iso: string) {
+ const date = new Date(iso);
+ const pad = (value: number) => value < 10 ? `0${value}` : String(value);
+
+ return [
+ date.getFullYear(),
+ pad(date.getMonth() + 1),
+ pad(date.getDate()),
+ pad(date.getHours()),
+ pad(date.getMinutes()),
+ pad(date.getSeconds()),
+ ].join("");
+}
+
+/**
+ * 兼容电子秤服务常见的消息格式：
+ * - 纯数字，例如 `2.49`
+ * - JSON，例如 `{"weight": 2490, "unit": "g"}`
+ * - JSON 千克字段，例如 `{"weightKg": 2.49}`
+ *
+ * 返回值统一为千克；无效值、负数或不支持的单位返回 null。
+ */
+export function parseScaleMessage(message: string): number | null {
+ const trimmed = message.trim();
+ if (!trimmed) return null;
+
+ let payload: unknown = trimmed;
+ try {
+ payload = JSON.parse(trimmed);
+ } catch {
+ // 非 JSON 消息继续按纯数字处理。
+ }
+
+ if (typeof payload === "number" || typeof payload === "string") {
+ const value = Number(payload);
+ return Number.isFinite(value) && value >= 0 ? value : null;
+ }
+
+ if (!payload || typeof payload !== "object") return null;
+
+ const record = payload as Record;
+ const rawValue = record.weightKg ?? record.weight ?? record.value;
+ const value = Number(rawValue);
+ if (!Number.isFinite(value) || value < 0) return null;
+
+ const unit = String(record.unit ?? (record.weightKg != null ? "kg" : "kg")).toLowerCase();
+ if (unit === "kg") return value;
+ if (unit === "g") return value / 1000;
+ if (unit === "lb" || unit === "lbs") return value / UNIT_FACTORS.lb;
+ return null;
+}
+
+export type StabilityResult = {
+ stable: boolean;
+ progress: number;
+};
+
+/**
+ * 根据连续采样窗口判断重量是否稳定。
+ * 至少需要 6 个有效样本，样本极差小于 8 克时判定稳定。
+ */
+export function evaluateStability(samples: number[]): StabilityResult {
+ // 不使用 Array.prototype.at，确保兼容终端内置的 Chrome 52 WebView。
+ const latest = samples.length ? samples[samples.length - 1] : 0;
+ if (samples.length < 6 || latest < 0.01) {
+ return {
+ stable: false,
+ progress: Math.min(85, samples.length * 14),
+ };
+ }
+
+ const spread = Math.max(...samples) - Math.min(...samples);
+ const stable = spread < 0.008;
+ return {
+ stable,
+ progress: stable ? 100 : Math.max(25, 90 - spread * 500),
+ };
+}
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 05e726d..39963ec 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -9,8 +9,16 @@ const eslintConfig = defineConfig([
globalIgnores([
// Default ignores of eslint-config-next:
".next/**",
+ ".vinext/**",
+ "dist/**",
"out/**",
"build/**",
+ "android-app/dist/**",
+ "android-app/node_modules/**",
+ "android-app/android/.gradle/**",
+ "android-app/android/build/**",
+ "android-app/android/app/build/**",
+ "android-app/android/app/src/main/assets/**",
"next-env.d.ts",
]),
]);
diff --git a/package.json b/package.json
index ae4351f..7117bfa 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"dev": "WRANGLER_LOG_PATH=.wrangler/wrangler.log vinext dev",
"build": "WRANGLER_LOG_PATH=.wrangler/wrangler.log vinext build",
"start": "WRANGLER_LOG_PATH=.wrangler/wrangler.log vinext start",
- "test": "npm run build && node --test tests/rendered-html.test.mjs",
+ "test": "pnpm run build && node --test tests/*.test.mjs",
"lint": "eslint . --ignore-pattern dist --ignore-pattern .next",
"db:generate": "drizzle-kit generate"
},
diff --git a/tests/rendered-html.test.mjs b/tests/rendered-html.test.mjs
index 11ec629..e095e93 100644
--- a/tests/rendered-html.test.mjs
+++ b/tests/rendered-html.test.mjs
@@ -1,13 +1,8 @@
import assert from "node:assert/strict";
-import { access, readFile, readdir } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
import test from "node:test";
-const developmentPreviewMeta =
- /]*\bname=["']codex-preview["'])(?=[^>]*\bcontent=["']development["'])[^>]*>/i;
-const templateRoot = new URL("../", import.meta.url);
-const previewRoot = new URL("../app/_sites-preview/", import.meta.url);
-
-async function render() {
+async function renderHome() {
const workerUrl = new URL("../dist/server/index.js", import.meta.url);
workerUrl.searchParams.set("test", `${process.pid}-${Date.now()}`);
const { default: worker } = await import(workerUrl.href);
@@ -28,64 +23,31 @@ async function render() {
);
}
-test("server-renders the starter loading skeleton", async () => {
- const response = await render();
+test("首页可正常服务端渲染正式称重界面", async () => {
+ const response = await renderHome();
assert.equal(response.status, 200);
assert.match(response.headers.get("content-type") ?? "", /^text\/html\b/i);
const html = await response.text();
- assert.match(html, developmentPreviewMeta);
- assert.match(html, /Your site is taking shape<\/title>/i);
- assert.match(html, /Building your site/);
- assert.match(html, /Your site is taking shape/);
- assert.match(
- html,
- /Your first version will appear here automatically when it’s ready\./,
- );
- assert.doesNotMatch(html, /Codex/);
- assert.match(html, /react-loading-skeleton/);
- assert.match(html, /role="status"/);
+ assert.match(html, /<title>智能称重终端｜沃尔核材<\/title>/);
+ assert.match(html, /选择废料类型/);
+ assert.match(html, /管理员登录/);
+ assert.match(html, /TYPE ID · (?:<!-- -->)?3/);
+ assert.match(html, /TYPE ID · (?:<!-- -->)?6/);
});
-test("keeps the loading skeleton scoped and disposable", async () => {
- const [preview, css, page, layout, packageJson, files] = await Promise.all([
- readFile(new URL("SkeletonPreview.tsx", previewRoot), "utf8"),
- readFile(new URL("preview.css", previewRoot), "utf8"),
+test("正式代码不包含历史人员、机台或重量模拟数据", async () => {
+ const [page, utilities] = await Promise.all([
readFile(new URL("../app/page.tsx", import.meta.url), "utf8"),
- readFile(new URL("../app/layout.tsx", import.meta.url), "utf8"),
- readFile(new URL("../package.json", import.meta.url), "utf8"),
- readdir(previewRoot),
+ readFile(new URL("../app/scale-utils.ts", import.meta.url), "utf8"),
]);
- assert.deepEqual(files.sort(), ["SkeletonPreview.tsx", "preview.css"]);
- assert.match(preview, /from "react-loading-skeleton"/);
- assert.match(preview, /baseColor="#eceae7"/);
- assert.match(preview, /highlightColor="#f9f8f6"/);
- assert.match(preview, /duration=\{2\.8\}/);
- assert.match(preview, /sites-skeleton-search-placeholder/);
- assert.match(packageJson, /"react-loading-skeleton": "3\.5\.0"/);
+ for (const legacySample of ["张伟", "E-0826", "A01 绕线机", "2.486"]) {
+ assert.doesNotMatch(page, new RegExp(legacySample));
+ }
- const shellIndex = preview.indexOf('className="sites-skeleton-shell"');
- const statusIndex = preview.indexOf('className="sites-skeleton-status"');
- assert.ok(shellIndex >= 0 && statusIndex > shellIndex);
- assert.match(css, /position:\s*fixed/);
- assert.match(css, /inset:\s*0/);
- assert.match(css, /opacity:\s*0\.52/);
- assert.match(css, /prefers-reduced-motion:\s*reduce/);
- assert.doesNotMatch(css, /#020617|canvas|pets|progress/i);
- assert.doesNotMatch(
- preview,
- /loading-spinner|status-mark|status-progress|canvas|cookie|random/i,
- );
-
- assert.match(page, /export const metadata:\s*Metadata/);
- assert.match(page, /"codex-preview": "development"/);
- assert.match(page, /<SkeletonPreview \/>/);
- assert.match(layout, /title:\s*"Starter Project"/);
- assert.doesNotMatch(layout, /codex-preview|_sites-preview|themeColor|\bViewport\b/);
- assert.doesNotMatch(css, /(^|\s)(html|body)\s*\{/m);
-
- await assert.rejects(
- access(new URL("public/_sites-preview", templateRoot)),
- );
+ assert.match(page, /new WebSocket\(appSettings\.weight\.trim\(\)\)/);
+ assert.match(page, /if \(!appSettings\.upload\.trim\(\)\) throw/);
+ assert.match(page, /evaluateStability\(stableSamples\.current\)/);
+ assert.match(utilities, /返回值统一为千克/);
});
diff --git a/tests/scale-utils.test.mjs b/tests/scale-utils.test.mjs
new file mode 100644
index 0000000..43848b9
--- /dev/null
+++ b/tests/scale-utils.test.mjs
@@ -0,0 +1,44 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+ createFileTimestamp,
+ evaluateStability,
+ formatWeight,
+ parseScaleMessage,
+} from "../app/scale-utils.ts";
+
+test("电子秤消息统一转换为千克", () => {
+ assert.equal(parseScaleMessage("2.49"), 2.49);
+ assert.equal(parseScaleMessage('{"weight":2490,"unit":"g"}'), 2.49);
+ assert.equal(parseScaleMessage('{"weightKg":2.49}'), 2.49);
+ assert.ok(Math.abs(parseScaleMessage('{"value":2.20462262,"unit":"lb"}') - 1) < 1e-9);
+});
+
+test("电子秤消息拒绝非法数据", () => {
+ assert.equal(parseScaleMessage(""), null);
+ assert.equal(parseScaleMessage("-1"), null);
+ assert.equal(parseScaleMessage('{"weight":"abc"}'), null);
+ assert.equal(parseScaleMessage('{"weight":1,"unit":"oz"}'), null);
+});
+
+test("连续相同读数可完成稳定判断", () => {
+ assert.deepEqual(evaluateStability([2.49, 2.49, 2.49, 2.49, 2.49]), {
+ stable: false,
+ progress: 70,
+ });
+ assert.deepEqual(evaluateStability([2.49, 2.49, 2.49, 2.49, 2.49, 2.49]), {
+ stable: true,
+ progress: 100,
+ });
+ assert.equal(evaluateStability([2.4, 2.5, 2.42, 2.51, 2.43, 2.5]).stable, false);
+});
+
+test("重量格式和文件时间戳符合终端规范", () => {
+ assert.equal(formatWeight(2.486, "kg"), "2.49");
+ assert.equal(formatWeight(2.486, "g"), "2486.00");
+ assert.equal(formatWeight(Number.NaN, "kg"), "0.00");
+
+ const localTime = new Date(2026, 6, 28, 16, 9, 5).toISOString();
+ assert.equal(createFileTimestamp(localTime), "20260728160905");
+});
diff --git a/tsconfig.json b/tsconfig.json
index 3a13f90..8603368 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -30,5 +30,11 @@
".next/dev/types/**/*.ts",
"**/*.mts"
],
- "exclude": ["node_modules"]
+ "exclude": [
+ "node_modules",
+ "android-app",
+ "db",
+ "examples",
+ "worker"
+ ]
}