@@ -498,7 +487,6 @@
/* ---- 读取参数 ---- */
var userName = getUrlParam('user') || '刘九';
var taskNo = getUrlParam('task') || 'T-001';
- var packName = getUrlParam('pack') || '宫保鸡丁套餐';
/* 用户信息 */
document.getElementById('topUser').textContent = userName;
@@ -508,30 +496,34 @@
var taskData = {
'T-001': {
orderNo: 'PO-20260616-001',
- mealPacks: {
- '宫保鸡丁套餐': {
- packName: '宫保鸡丁套餐',
- packSize: 3,
- notes: '少辣',
- ingredients: [
- { name: '土豆丝', icon: '🥔', weightPerPack: 500, weighed: 1500 },
- { name: '胡萝卜丝', icon: '🥕', weightPerPack: 500, weighed: 1500 },
- { name: '黄瓜片', icon: '🥒', weightPerPack: 500, weighed: 1500 },
- { name: '大葱丝', icon: '🧅', weightPerPack: 500, weighed: 1500 },
- { name: '紫洋葱丝', icon: '🧅', weightPerPack: 500, weighed: 1500 }
- ]
- },
- '鱼香肉丝套餐': {
- packName: '鱼香肉丝套餐',
- packSize: 2,
- notes: '',
- ingredients: [
- { name: '胡萝卜丝', icon: '🥕', weightPerPack: 750, weighed: 0 },
- { name: '白菜丝', icon: '🥬', weightPerPack: 1000, weighed: 0 },
- { name: '土豆丝', icon: '🥔', weightPerPack: 500, weighed: 0 }
- ]
- }
- }
+ mealPacks: [
+ { type: '净菜包', packName: '土豆丝', packSize: 3, packSpec: '500g', ingredients: [
+ { name: '土豆丝', icon: '🥔', weightPerPack: 500, weighed: 750 }
+ ]},
+ { type: '净菜包', packName: '胡萝卜丝', packSize: 3, packSpec: '500g', ingredients: [
+ { name: '胡萝卜丝', icon: '🥕', weightPerPack: 500, weighed: 750 }
+ ]},
+ { type: '净菜包', packName: '黄瓜片', packSize: 3, packSpec: '500g', ingredients: [
+ { name: '黄瓜片', icon: '🥒', weightPerPack: 500, weighed: 0 }
+ ]},
+ { type: '餐品净菜包', packName: '宫保鸡丁套餐', packSize: 2, packSpec: '大份800g', ingredients: [
+ { name: '土豆丝', icon: '🥔', weightPerPack: 300, weighed: 0 },
+ { name: '胡萝卜丝', icon: '🥕', weightPerPack: 250, weighed: 0 },
+ { name: '黄瓜片', icon: '🥒', weightPerPack: 250, weighed: 0 }
+ ]}
+ ]
+ },
+ 'T-002': {
+ orderNo: 'PO-20260616-002',
+ mealPacks: [
+ { type: '净菜包', packName: '白菜丝', packSize: 2, packSpec: '1000g', ingredients: [
+ { name: '白菜丝', icon: '🥬', weightPerPack: 1000, weighed: 0 }
+ ]},
+ { type: '餐品净菜包', packName: '鱼香肉丝套餐', packSize: 2, packSpec: '大份800g', ingredients: [
+ { name: '白菜丝', icon: '🥬', weightPerPack: 400, weighed: 0 },
+ { name: '胡萝卜丝', icon: '🥕', weightPerPack: 400, weighed: 0 }
+ ]}
+ ]
}
};
@@ -548,7 +540,7 @@
/* ---- 状态变量 ---- */
var state = 'idle'; // idle | detecting
- var currentPack = null;
+ var allIngredients = []; // 扁平化：所有包的食材 [{name, icon, weightPerPack, packName, packType, packSize, weighed}]
var currentIngIdx = 0;
/* ---- 初始化 ---- */
@@ -556,13 +548,27 @@
var task = taskData[taskNo];
if (!task) { showToast('任务不存在', 2000, 'error'); return; }
- currentPack = task.mealPacks[packName];
- if (!currentPack) { showToast('餐品净菜包不存在', 2000, 'error'); return; }
+ /* 扁平化：将所有包的食材展开到统一列表 */
+ allIngredients = [];
+ task.mealPacks.forEach(function(pack) {
+ pack.ingredients.forEach(function(ing) {
+ allIngredients.push({
+ name: ing.name,
+ icon: ing.icon,
+ weightPerPack: ing.weightPerPack,
+ weighed: ing.weighed,
+ packName: pack.packName,
+ packType: pack.type,
+ packSize: pack.packSize,
+ packSpec: pack.packSpec || ''
+ });
+ });
+ });
/* 找到第一个待称重的食材 */
- for (var i = 0; i < currentPack.ingredients.length; i++) {
- var ing = currentPack.ingredients[i];
- var need = ing.weightPerPack * currentPack.packSize;
+ for (var i = 0; i < allIngredients.length; i++) {
+ var ing = allIngredients[i];
+ var need = ing.weightPerPack * ing.packSize;
if (ing.weighed < need) {
currentIngIdx = i;
break;
@@ -572,49 +578,74 @@
/* 设置页面信息 */
document.getElementById('taskOrder').textContent = task.orderNo;
document.getElementById('taskNo').textContent = taskNo;
- document.getElementById('packTag').textContent = currentPack.packName;
- document.getElementById('taskPackName').textContent = currentPack.packName;
- document.getElementById('taskPackSize').textContent = currentPack.packSize + ' 份';
+ /* 打包份数：每个食材项对应其所属包的 packSize，累加所有食材 */
+ var totalPacks = 0;
+ task.mealPacks.forEach(function(pack) {
+ pack.ingredients.forEach(function() { totalPacks += pack.packSize; });
+ });
+ document.getElementById('taskTotalPacks').textContent = totalPacks;
+ /* 订单状态：全部食材已完成 → 已完成，否则 → 待配比 */
+ var allDone = allIngredients.every(function(ing) {
+ return ing.weighed >= ing.weightPerPack * ing.packSize;
+ });
+ var statusEl = document.getElementById('taskStatus');
+ statusEl.textContent = allDone ? '已完成' : '待配比';
+ statusEl.className = 'task-card__item-value' + (allDone ? ' task-card__item-value--green' : ' task-card__item-value--yellow');
renderItemlist();
/* 初始化秤体重量显示为当前食材已有重量 */
- var initIng = currentPack.ingredients[currentIngIdx];
+ var initIng = allIngredients[currentIngIdx];
document.getElementById('scaleWeightValue').textContent = initIng.weighed.toFixed(2);
/* 显示相机覆盖层，等待用户手动点击识别 */
document.getElementById('cameraOverlay').classList.add('show');
}
- /* ---- 渲染食材清单 ---- */
+ /* ---- 渲染食材清单（卡片形式） ---- */
function renderItemlist() {
var body = document.getElementById('itemListBody');
body.innerHTML = '';
- currentPack.ingredients.forEach(function(ing, idx) {
- var need = Math.round(ing.weightPerPack * currentPack.packSize * 100) / 100;
+ allIngredients.forEach(function(ing, idx) {
+ var need = Math.round(ing.weightPerPack * ing.packSize * 100) / 100;
var isDone = ing.weighed >= need;
var isCurrent = (idx === currentIngIdx);
var row = document.createElement('div');
row.className = 'item-row' + (isCurrent ? ' current' : '');
- var actualClass = 'item-row__actual--zero';
- if (isDone) actualClass = 'item-row__actual--done';
- else if (ing.weighed > 0) actualClass = 'item-row__actual--progress';
+ var actualClass = 'item-card__data-value--zero';
+ if (isDone) actualClass = 'item-card__data-value--done';
+ else if (ing.weighed > 0) actualClass = 'item-card__data-value--progress';
var statusTag = isDone
? '
已完成'
: '
待称重';
+ /* 餐品净菜包名称：净菜包不显示此行 */
+ var packNameDisplay = ing.packType === '餐品净菜包' ? ing.packName : '—';
+ var packSpecDisplay = ing.packSpec || '—';
+
row.innerHTML =
- '
' + ing.icon + '' + ing.name + '
' +
- '
' + ing.weightPerPack + ' 克
' +
- '
' + currentPack.packSize + ' 份
' +
- '
' + need + '
' +
- '
' + ing.weighed + '
' +
- '
' + statusTag + '
' +
- '
' + (ing.weighed > 0 ? '' : '') + '
';
+ /* 卡片头部：名称 + 状态 + 清空按钮 */
+ '' +
+ /* 元信息行：餐品净菜包名 + 包装规格 */
+ '
' +
+ /* 数据行：每份用量 / 份数 / 所需总重 / 已称 */
+ '
' +
+ '
每份用量:' + ing.weightPerPack + 'g
' +
+ '
份数:' + ing.packSize + '
' +
+ '
需:' + need + 'g
' +
+ '
已称:' + ing.weighed + 'g
' +
+ '
';
body.appendChild(row);
});
@@ -633,85 +664,30 @@
/* 隐藏相机覆盖层 */
document.getElementById('cameraOverlay').classList.remove('show');
- /* 生成候选列表 */
- updateCandidates();
-
- /* 模拟识别 + 称重完成（延迟后自动记录） */
+ /* 模拟识别延迟后生成候选列表，等待用户点选 */
setTimeout(function() {
- var ing = currentPack.ingredients[currentIngIdx];
- var need = ing.weightPerPack * currentPack.packSize;
- var remaining = Math.max(0, need - ing.weighed);
- var simWeight = Math.round(Math.min(remaining * 0.88, remaining) * 100) / 100;
-
- ing.weighed = Math.round((ing.weighed + simWeight) * 100) / 100;
-
- /* 更新秤体重量显示 */
- document.getElementById('scaleWeightValue').textContent = ing.weighed.toFixed(2);
-
- /* 更新识别状态 */
- document.getElementById('statusDot').className = 'status-dot status-dot--done';
-
- /* 随机取一个 AI 结果 */
- var keys = Object.keys(aiResults);
- var randomKey = keys[Math.floor(Math.random() * keys.length)];
- var result = aiResults[randomKey];
- document.getElementById('statusText').textContent = '识别完成: ' + result.name + ' — 置信度 ' + result.confidence + '%';
-
- showToast('称重完成: ' + result.name + ' ' + simWeight.toFixed(2) + '克', 2000, 'success');
-
- /* 刷新清单 */
- renderItemlist();
-
- /* 延迟回到就绪态 */
- setTimeout(function() {
- state = 'idle';
- document.getElementById('statusDot').className = 'status-dot status-dot--ready';
- document.getElementById('statusText').textContent = '就绪，等待食材放置';
- document.getElementById('candidateList').innerHTML = '';
- document.getElementById('candidateEmpty').classList.remove('hide');
- document.getElementById('candidateTitle').textContent = '智能识别候选';
-
- /* 自动跳转到下一个待称重食材 */
- var found = false;
- for (var i = 0; i < currentPack.ingredients.length; i++) {
- var ing = currentPack.ingredients[i];
- var need = ing.weightPerPack * currentPack.packSize;
- if (ing.weighed < need) {
- currentIngIdx = i;
- found = true;
- break;
- }
- }
- renderItemlist();
-
- if (found) {
- /* 更新秤体显示为下一食材当前重量 */
- var nextIng = currentPack.ingredients[currentIngIdx];
- document.getElementById('scaleWeightValue').textContent = nextIng.weighed.toFixed(2);
- document.getElementById('cameraOverlay').classList.add('show');
- } else {
- document.getElementById('scaleWeightValue').textContent = '0.00';
- showToast('所有食材已称重完成', 2500, 'success');
- }
- }, 2500);
- }, 1200);
+ document.getElementById('statusDot').className = 'status-dot status-dot--ready';
+ document.getElementById('statusText').textContent = '识别完成，请在候选区选择食材';
+ updateCandidates();
+ }, 800);
}
- /* ---- 更新候选食材列表 ---- */
+ /* ---- 更新候选食材列表（按置信度排序） ---- */
function updateCandidates() {
var list = document.getElementById('candidateList');
var empty = document.getElementById('candidateEmpty');
var title = document.getElementById('candidateTitle');
var packNames = {};
- currentPack.ingredients.forEach(function(ing) { packNames[ing.name] = true; });
+ allIngredients.forEach(function(ing) { packNames[ing.name] = true; });
var keys = Object.keys(aiResults);
var fromPack = keys.filter(function(k) { return packNames[aiResults[k].name]; });
var others = keys.filter(function(k) { return !packNames[aiResults[k].name]; });
- fromPack.sort(function() { return Math.random() - 0.5; });
- others.sort(function() { return Math.random() - 0.5; });
+ /* 按置信度降序排列 */
+ fromPack.sort(function(a, b) { return aiResults[b].confidence - aiResults[a].confidence; });
+ others.sort(function(a, b) { return aiResults[b].confidence - aiResults[a].confidence; });
var selected = fromPack.slice(0, 3).concat(others.slice(0, 1));
@@ -720,16 +696,15 @@
list.innerHTML = '';
selected.forEach(function(key, i) {
var r = aiResults[key];
- var sim = Math.floor(Math.random() * 9) + 86;
var card = document.createElement('div');
card.className = 'candidate-card';
card.onclick = function() {
- showToast('已选择: ' + r.name, 1500, 'success');
+ openRatioModal(r);
};
card.innerHTML =
'
' + r.icon + '
' +
'
' + r.name + '
' +
- '
' + sim + '%
';
+ '
' + r.confidence + '%
';
list.appendChild(card);
});
@@ -745,10 +720,95 @@
event.target.value = '';
}
+ /* ---- 配比确认弹窗 ---- */
+ var pendingCandidate = null; // 待确认的识别结果
+
+ function openRatioModal(result) {
+ pendingCandidate = result;
+ /* 填入弹窗：食材图标、名称、当前秤重 */
+ document.getElementById('modalIcon').innerHTML = result.icon;
+ document.getElementById('modalFoodName').textContent = result.name;
+ document.getElementById('modalWeight').textContent = parseFloat(document.getElementById('scaleWeightValue').textContent).toFixed(1);
+ document.getElementById('modalOverlay').classList.add('show');
+ }
+
+ /* 刷新弹窗中的秤重读数 */
+ function refreshWeight() {
+ document.getElementById('modalWeight').textContent = parseFloat(document.getElementById('scaleWeightValue').textContent).toFixed(1);
+ }
+
+ function closeModal() {
+ pendingCandidate = null;
+ document.getElementById('modalOverlay').classList.remove('show');
+ }
+
+ function confirmPack() {
+ if (!pendingCandidate) return;
+ document.getElementById('modalOverlay').classList.remove('show');
+
+ /* 将弹窗中显示的称重结果写入当前食材 */
+ var ing = allIngredients[currentIngIdx];
+ var modalWeight = parseFloat(document.getElementById('modalWeight').textContent) || 0;
+ ing.weighed = modalWeight;
+
+ /* 更新秤体重量 */
+ document.getElementById('scaleWeightValue').textContent = ing.weighed.toFixed(2);
+
+ /* 更新识别状态 */
+ document.getElementById('statusDot').className = 'status-dot status-dot--done';
+ document.getElementById('statusText').textContent = '配比确认: ' + pendingCandidate.name + ' — 置信度 ' + pendingCandidate.confidence + '%';
+
+ showToast('称重完成: ' + pendingCandidate.name + ' ' + modalWeight.toFixed(2) + '克', 2000, 'success');
+ pendingCandidate = null;
+
+ /* 刷新清单 */
+ renderItemlist();
+
+ /* 同步更新订单状态 */
+ var allDoneNow = allIngredients.every(function(ing) {
+ return ing.weighed >= ing.weightPerPack * ing.packSize;
+ });
+ var taskStatusEl = document.getElementById('taskStatus');
+ taskStatusEl.textContent = allDoneNow ? '已完成' : '待配比';
+ taskStatusEl.className = 'task-card__item-value' + (allDoneNow ? ' task-card__item-value--green' : ' task-card__item-value--yellow');
+
+ /* 延迟回到就绪态 */
+ setTimeout(function() {
+ state = 'idle';
+ document.getElementById('statusDot').className = 'status-dot status-dot--ready';
+ document.getElementById('statusText').textContent = '就绪，等待食材放置';
+ document.getElementById('candidateList').innerHTML = '';
+ document.getElementById('candidateEmpty').classList.remove('hide');
+ document.getElementById('candidateTitle').textContent = '智能识别候选';
+
+ /* 自动跳转到下一个待称重食材 */
+ var found = false;
+ for (var i = 0; i < allIngredients.length; i++) {
+ var ing = allIngredients[i];
+ var need = ing.weightPerPack * ing.packSize;
+ if (ing.weighed < need) {
+ currentIngIdx = i;
+ found = true;
+ break;
+ }
+ }
+ renderItemlist();
+
+ if (found) {
+ var nextIng = allIngredients[currentIngIdx];
+ document.getElementById('scaleWeightValue').textContent = nextIng.weighed.toFixed(2);
+ document.getElementById('cameraOverlay').classList.add('show');
+ } else {
+ document.getElementById('scaleWeightValue').textContent = '0.00';
+ showToast('所有食材已称重完成', 2500, 'success');
+ }
+ }, 2500);
+ }
+
/* ---- 配比完成 ---- */
function handlePackDone() {
- var allDone = currentPack.ingredients.every(function(ing) {
- var need = ing.weightPerPack * currentPack.packSize;
+ var allDone = allIngredients.every(function(ing) {
+ var need = ing.weightPerPack * ing.packSize;
return ing.weighed >= need;
});
if (!allDone) {
@@ -763,7 +823,7 @@
/* ---- 清空重量 ---- */
function clearWeight(idx) {
- var ing = currentPack.ingredients[idx];
+ var ing = allIngredients[idx];
ing.weighed = 0;
/* 如果清空的是当前食材，同步更新秤体显示 */
if (idx === currentIngIdx) {
@@ -773,6 +833,13 @@
showToast(ing.name + ' 重量已清空', 1500, 'success');
}
+ /* ---- 退出登录 ---- */
+ function handleLogout() {
+ if (confirm('确定退出登录？')) {
+ window.location.href = 'index.html';
+ }
+ }
+
/* ---- 重新识别 ---- */
function handleReidentify() {
if (state === 'detecting') return;
diff --git a/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md b/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md
index 344d0bc..f608ff3 100644
--- a/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md
+++ b/other-module/canteen-device/ratio-scale/doc/CHANGELOG.md
@@ -1,5 +1,25 @@
# 净菜配比秤 CHANGELOG
+## [1.3.0] - 2026-06-17
+
+### 重构
+- **数据结构扁平化**：任务由"一个订单一个餐品净菜包"改为"一个订单多个净菜包/餐品净菜包"（mealPacks 数组），支持混合打包模式
+- **任务列表页（01）**：表格从6列扩展为8列，新增「净菜/餐品」和「包装规格」列；去配比不再携带 packName 参数；订单状态由所有包完成才算完成
+- **称重打包页（02）**：食材清单从表格布局改为卡片布局，每张卡片展示名称、状态、餐品净菜包归属、包装规格、用量/份数/需/已称
+- **配比确认弹窗**：AI 识别后不再自动写入重量，改为弹窗展示食材图标、名称、当前秤重，支持刷新读取，需人工点选候选食材并确认
+- **候选列表排序**：AI 识别候选按置信度降序排列（不再随机）
+
+### 新增
+- 02 页顶部栏新增「退出登录」按钮
+- 02 页任务信息卡新增「订单状态」字段（待配比/已完成）
+- 02 页候选识别区点选食材后弹出配比确认弹窗
+
+### 删除
+- 02 页移除包装信息弹窗（包装方式/保质期/存放温度/终端设备），统一改为配比确认弹窗
+- 02 页顶部栏移除 packTag 展示
+
+---
+
## [1.2.0] - 2026-06-16
### 新增