diff --git a/web-admin/nutrition/din-terminal.html b/web-admin/nutrition/din-terminal.html
index 192f110..979e47e 100644
--- a/web-admin/nutrition/din-terminal.html
+++ b/web-admin/nutrition/din-terminal.html
@@ -796,16 +796,13 @@ var SCALE_COLS={
face:[
{key:'start',label:'开始时间',field:'start'},
{key:'end',label:'结束时间',field:'end'},
- {key:'status',label:'状态',field:'status'},
- {key:'weight',label:'重量变化',field:'weight'},
- {key:'total',label:'总重量',field:'total'}
+ {key:'status',label:'状态',field:'status'}
],
weight:[
- {key:'start',label:'开始时间',field:'start'},
- {key:'end',label:'结束时间',field:'end'},
- {key:'target',label:'识别对象',field:'target'},
+ {key:'start',label:'日期/时间',field:'start'},
+ {key:'target',label:'用户',field:'target'},
{key:'submit',label:'提交重量',field:'submit'},
- {key:'total',label:'总重量',field:'total'}
+ {key:'total',label:'当前重量',field:'total'}
],
log:[
{key:'time',label:'日期/时间',field:'time'},
@@ -949,12 +946,12 @@ function renderScaleStatus(){
${scaleThead('status')}${rows}
`;
}
-/* 维度2:人脸识别数据 — 开始/结束时间 / 状态 / 用户类型 / 重量变化 + 视频回放 */
+/* 维度2:人脸识别数据 — 开始/结束时间 / 状态 + 视频回放 */
var SCALE_FACE_RECORDS=[
- {start:'2026-08-25 08:15:23.456',end:'2026-08-25 08:15:58.210',status:'刷脸+离开',userType:'系统用户',total:'486.5g',weight:'+486.5g'},
- {start:'2026-08-25 08:14:51.203',end:'2026-08-25 08:15:02.118',status:'刷脸',userType:'系统用户',total:'462.0g',weight:'+462.0g'},
- {start:'2026-08-25 08:13:47.889',end:'2026-08-25 08:14:10.540',status:'离开',userType:'系统用户',total:'0.0g',weight:'-445.8g'},
- {start:'2026-08-25 08:12:09.310',end:'2026-08-25 08:12:30.775',status:'刷脸',userType:'陌生人',total:'0.0g',weight:'+0.0g'}
+ {start:'2026-08-25 08:15:23.456',end:'2026-08-25 08:15:58.210',status:'刷脸+离开',userType:'系统用户',weight:'+486.5g'},
+ {start:'2026-08-25 08:14:51.203',end:'2026-08-25 08:15:02.118',status:'刷脸',userType:'系统用户',weight:'+462.0g'},
+ {start:'2026-08-25 08:13:47.889',end:'2026-08-25 08:14:10.540',status:'离开',userType:'系统用户',weight:'-445.8g'},
+ {start:'2026-08-25 08:12:09.310',end:'2026-08-25 08:12:30.775',status:'刷脸',userType:'陌生人',weight:'+0.0g'}
];
function renderScaleFace(){
@@ -965,9 +962,7 @@ function renderScaleFace(){
};
const rows=getFilteredScaleRows('face').map((f)=>{
const statusTag=statusTagMap[f.status]||''+escapeHtml(f.status)+'';
- const isPos=f.weight.startsWith('+');
- const weightHtml=`${f.weight}`;
- return `| ${f.start} | ${f.end} | ${statusTag} | ${weightHtml} | ${f.total} | 回放视频 |
`;
+ return `| ${f.start} | ${f.end} | ${statusTag} | 回放视频 |
`;
}).join('');
return `人脸识别数据
${scaleThead('face','操作')}${rows}
`;
@@ -1075,15 +1070,15 @@ function formatFaceVideoTime(t){
return (m<10?'0'+m:m)+':'+(s<10?'0'+s:s);
}
-/* 维度3:重量变化数据 — 开始/结束时间 / 识别对象 / 提交重量 / 总重量 */
+/* 维度3:重量变化数据 — 日期/时间 / 用户 / 提交重量 / 当前重量 */
SCALE_WEIGHT_RECORDS=[
- {start:'2026-08-25 08:15:22.701',end:'2026-08-25 08:15:30.210',target:'EMP0234 · 张伟',submit:'436.5',total:'486.5'},
- {start:'2026-08-25 08:14:50.512',end:'2026-08-25 08:14:58.430',target:'无用户',submit:'412.0',total:'462.0'},
- {start:'2026-08-25 08:13:46.098',end:'2026-08-25 08:13:55.118',target:'EMP0357 · 王强',submit:'—',total:'501.2'},
- {start:'2026-08-25 08:12:08.876',end:'2026-08-25 08:12:18.775',target:'无用户',submit:'0.0',total:'0.0'}
+ {start:'2026-08-25 08:15:22.701',target:'EMP0234 · 张伟',submit:'436.5',total:'486.5'},
+ {start:'2026-08-25 08:14:50.512',target:'无用户',submit:'412.0',total:'462.0'},
+ {start:'2026-08-25 08:13:46.098',target:'EMP0357 · 王强',submit:'—',total:'501.2'},
+ {start:'2026-08-25 08:12:08.876',target:'无用户',submit:'0.0',total:'0.0'}
];
function renderScaleWeight(){
- const rows=getFilteredScaleRows('weight').map(w=>`| ${w.start} | ${w.end} | ${w.target} | ${w.submit} | ${w.total} |
`).join('');
+ const rows=getFilteredScaleRows('weight').map(w=>`| ${w.start} | ${w.target} | ${w.submit} | ${w.total} |
`).join('');
return `重量变化数据
${scaleThead('weight')}${rows}
`;
}
diff --git a/web-admin/nutrition/doc/CHANGELOG.md b/web-admin/nutrition/doc/CHANGELOG.md
index 4a1b957..16ccd61 100644
--- a/web-admin/nutrition/doc/CHANGELOG.md
+++ b/web-admin/nutrition/doc/CHANGELOG.md
@@ -1,5 +1,11 @@
# 营养用餐管理端 CHANGELOG
+## [2026-08-27] refactor: 餐线营养秤概览字段调整
+
+- `din-terminal.html` 设备概览「餐线营养秤」:
+ - 重量变化数据 Tab:字段由「开始时间/结束时间/识别对象/提交重量/总重量」调整为「日期/时间/用户/提交重量/当前重量」
+ - 人脸识别数据 Tab:删除「重量变化」「总重量」两列
+
## [2026-08-27] feat: 订餐终端设备概览新增「餐线营养秤」Tab
- `din-terminal.html` 订餐终端设备概览: