From 8e2737be4a151e94c1040e93892aeb07a7d50ec6 Mon Sep 17 00:00:00 2001 From: liuyunqin Date: Mon, 6 Jul 2026 16:48:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E5=81=A5=E5=BA=B7?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E5=92=8C=E4=BD=93=E9=87=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A3=9F=E8=B0=B1=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weight-management/diet-advice.html | 4 +- .../weight-management/diet-questionnaire.html | 19 +- .../health-monitor/archive-algorithm.html | 2 +- .../archive-personal-detail.html | 2 +- .../health-monitor/archive-personal.html | 2 +- .../archive-unit-crowd-status-detail.html | 2 +- .../archive-unit-environment-detail.html | 2 +- .../archive-unit-health-checkup-detail.html | 2 +- .../archive-unit-wearable-detail.html | 2 +- web-admin/health-monitor/archive-unit.html | 2 +- .../health-monitor/crowd-status-employee.html | 2 +- .../health-monitor/crowd-status-unit.html | 2 +- web-admin/health-monitor/doc/PRD.md | 4 +- .../environment/indoor-app-record.html | 2 +- .../environment/indoor-data-analysis.html | 2 +- .../environment/indoor-data-monitor.html | 2 +- .../environment/indoor-device-category.html | 2 +- .../environment/indoor-device-list.html | 2 +- .../environment/indoor-exception-alarm.html | 2 +- .../indoor-history-alarm-detail.html | 2 +- .../environment/indoor-history-data.html | 2 +- .../indoor-history-monitor-detail.html | 2 +- .../environment/outdoor-app-record.html | 2 +- .../environment/outdoor-data-analysis.html | 2 +- .../environment/outdoor-data-monitor.html | 2 +- .../environment/outdoor-device-category.html | 2 +- .../environment/outdoor-device-list.html | 2 +- .../environment/outdoor-exception-alarm.html | 2 +- .../outdoor-history-alarm-detail.html | 2 +- .../environment/outdoor-history-data.html | 2 +- .../outdoor-history-monitor-detail.html | 2 +- .../environment/pollen-app-record.html | 2 +- .../environment/pollen-data-analysis.html | 2 +- .../environment/pollen-data-monitor.html | 2 +- .../environment/pollen-device-category.html | 2 +- .../environment/pollen-device-list.html | 2 +- .../environment/pollen-exception-alarm.html | 2 +- .../pollen-history-alarm-detail.html | 2 +- .../environment/pollen-history-data.html | 2 +- .../pollen-history-monitor-detail.html | 2 +- .../environment/water-app-record.html | 2 +- .../environment/water-data-analysis.html | 2 +- .../environment/water-data-monitor.html | 2 +- .../environment/water-device-category.html | 2 +- .../environment/water-device-list.html | 2 +- .../environment/water-exception-alarm.html | 2 +- .../water-history-alarm-detail.html | 2 +- .../environment/water-history-data.html | 2 +- .../water-history-monitor-detail.html | 2 +- web-admin/health-monitor/exception-dirty.html | 2 +- .../health-monitor/exception-result.html | 10 +- .../health-checkup/activity-detail.html | 2 +- .../health-checkup/activity-edit.html | 2 +- .../health-checkup/activity-manage.html | 4 +- .../health-checkup/activity-stat.html | 2 +- .../health-checkup/survey-category.html | 282 ---------- .../health-checkup/survey-edit.html | 2 +- .../health-checkup/survey-manage.html | 2 +- .../health-monitor/wearable/bind-record.html | 2 +- .../health-monitor/wearable/dept-report.html | 2 +- .../health-monitor/wearable/dept-stat.html | 2 +- .../wearable/exception-event.html | 2 +- .../health-monitor/wearable/notification.html | 2 +- .../wearable/ops/alarm-data.html | 2 +- .../wearable/ops/alarm-heartrate.html | 2 +- .../wearable/ops/alarm-spo2.html | 2 +- .../wearable/ops/alarm-stress.html | 2 +- .../wearable/ops/alarm-temp.html | 2 +- .../wearable/ops/log-error.html | 2 +- .../health-monitor/wearable/ops/log-mqtt.html | 2 +- .../wearable/ops/log-network.html | 2 +- .../health-monitor/wearable/ops/log-task.html | 2 +- .../wearable/ops/log-version.html | 2 +- .../wearable/ops/monitor-activity.html | 2 +- .../wearable/ops/monitor-ecg.html | 2 +- .../wearable/ops/monitor-exercise.html | 2 +- .../wearable/ops/monitor-heartrate.html | 2 +- .../wearable/ops/monitor-sleep-watch5.html | 2 +- .../wearable/ops/monitor-sleep.html | 2 +- .../wearable/ops/monitor-spo2.html | 2 +- .../wearable/ops/monitor-stress.html | 2 +- .../wearable/ops/monitor-temp.html | 2 +- .../wearable/ops/sdc-overview.html | 2 +- .../wearable/ops/terminal-config-info.html | 2 +- .../wearable/ops/terminal-default-config.html | 2 +- .../wearable/personal-stat.html | 2 +- .../health-monitor/wearable/tool-manage.html | 2 +- .../health-monitor/wearable/user-data.html | 2 +- .../action-overview-detail.html | 1 + .../weight-management/action-overview.html | 1 + .../weight-management/action-record.html | 20 +- .../activity-statistics.html | 1 + web-admin/weight-management/detail-data.html | 1 + .../weight-management/recipe-record.html | 525 ++++++++++++++++++ .../weight-management/weight-ranking.html | 1 + 95 files changed, 645 insertions(+), 392 deletions(-) delete mode 100644 web-admin/health-monitor/health-checkup/survey-category.html create mode 100644 web-admin/weight-management/recipe-record.html diff --git a/employee-app/weight-management/diet-advice.html b/employee-app/weight-management/diet-advice.html index 8306864..faa0e38 100644 --- a/employee-app/weight-management/diet-advice.html +++ b/employee-app/weight-management/diet-advice.html @@ -675,7 +675,7 @@ body {
每日推荐摄入 - BMR 1900 × 活动系数 1.55 +
2645千卡
今日已摄入 1486 千卡，还可摄入 1159 千卡（热量缺口 300kcal）
@@ -1165,7 +1165,7 @@ function renderCalorie() { var remaining = cal - consumed; var pct = Math.round(consumed / cal * 1000) / 10; - document.getElementById('calorieBmr').textContent = 'BMR 1900 × 活动系数 ' + bmrF + '（' + bmrLabelMap.manual_labor + '）'; + document.getElementById('calorieBmr').textContent = ''; document.getElementById('calorieVal').innerHTML = cal + '千卡'; document.getElementById('calorieSub').textContent = '今日已摄入 ' + consumed + ' 千卡，还可摄入 ' + remaining + ' 千卡（热量缺口 300kcal）'; diff --git a/employee-app/weight-management/diet-questionnaire.html b/employee-app/weight-management/diet-questionnaire.html index a100f3d..50be29c 100644 --- a/employee-app/weight-management/diet-questionnaire.html +++ b/employee-app/weight-management/diet-questionnaire.html @@ -95,13 +95,13 @@ body { background: #f0f2f5; display: flex; justify-content: center; align-items: .custom-avoid-sheet__quick { display: flex; flex-wrap: wrap; gap: 8px; } .custom-avoid-sheet__quick-tag { font-size: 12px; padding: 5px 12px; border-radius: 16px; border: 1px solid #e0e0e0; color: #666; background: #fafafa; cursor: pointer; transition: all .2s; } .custom-avoid-sheet__quick-tag:hover { border-color: #b7eb8f; background: #f6ffed; } -.custom-avoid-sheet__quick-tag--added { border-color: #ffa39e; background: #fff1f0; color: #cf1322; } +.custom-avoid-sheet__quick-tag--added { border-color: #52c41a; background: #f6ffed; color: #52c41a; } .custom-avoid-sheet__quick-tag--added::after { content: ' ✓'; } /* ===== 自定义食材标签 ===== */ .questionnaire__custom-avoid { display: flex; gap: 8px; flex-wrap: wrap; margin-top: 8px; } -.questionnaire__custom-tag { font-size: 13px; padding: 8px 14px; border-radius: 20px; font-weight: 600; cursor: pointer; border: 1.5px solid #ffa39e; color: #cf1322; background: #fff1f0; transition: all .2s; display: flex; align-items: center; gap: 6px; } -.questionnaire__custom-tag:hover { background: #ffe9e7; } +.questionnaire__custom-tag { font-size: 13px; padding: 8px 14px; border-radius: 20px; font-weight: 600; cursor: pointer; border: 1.5px solid #52c41a; color: #52c41a; background: #f6ffed; transition: all .2s; display: flex; align-items: center; gap: 6px; } +.questionnaire__custom-tag:hover { background: #e6f7df; } .questionnaire__custom-tag::after { content: '✕'; font-size: 10px; opacity: 0.7; } .questionnaire__chip--add { border-style: dashed !important; color: #bbb !important; border-color: #d0d0d0 !important; background: #fafafa !important; } .questionnaire__chip--add:hover { border-color: #52c41a !important; color: #52c41a !important; background: #f6ffed !important; } @@ -220,7 +220,7 @@ body { background: #f0f2f5; display: flex; justify-content: center; align-items:
取消 - 添加规避食材 + 添加禁忌 确定
@@ -245,11 +245,10 @@ var userPreferences = { /* 长庆油田工作区域：省 → 地级市 */ var REGION_DATA = [ - { name: '陕西省', cities: ['西安市','延安市','榆林市','咸阳市'] }, - { name: '甘肃省', cities: ['庆阳市','平凉市'] }, - { name: '宁夏回族自治区', cities: ['银川市','吴忠市'] }, - { name: '内蒙古自治区', cities: ['鄂尔多斯市'] }, - { name: '山西省', cities: ['吕梁市','临汾市'] } + { name: '陕西省', cities: ['西安市','铜川市','宝鸡市','咸阳市','渭南市','延安市','汉中市','榆林市','安康市','商洛市'] }, + { name: '甘肃省', cities: ['兰州市','嘉峪关市','金昌市','白银市','天水市','武威市','张掖市','平凉市','酒泉市','庆阳市','定西市','陇南市','临夏回族自治州','甘南藏族自治州'] }, + { name: '宁夏回族自治区', cities: ['银川市','石嘴山市','吴忠市','固原市','中卫市'] }, + { name: '内蒙古自治区', cities: ['呼和浩特市','包头市','乌海市','赤峰市','通辽市','鄂尔多斯市','呼伦贝尔市','巴彦淖尔市','乌兰察布市','兴安盟','锡林郭勒盟','阿拉善盟'] } ]; var REGION_OTHER = '其他地区'; @@ -445,7 +444,7 @@ function submitQuestionnaire() { /* ================================================================ 自定义规避食材 — 底部输入 Sheet ================================================================ */ -var CUSTOM_AVOID_QUICK = ['苦瓜','芹菜','茄子','胡萝卜','青椒','香菇','洋葱','韭菜','虾皮','豆腐','西红柿','土豆','山药','冬瓜','南瓜','菠菜','白菜','豆芽','海带','竹笋']; +var CUSTOM_AVOID_QUICK = ['猪肉','牛肉','羊肉','鸡肉','鸭肉','鱼肉','虾','蟹','鸡蛋','牛奶','洋葱','香菜','葱','姜','蒜','韭菜','芹菜','虾皮']; var customAvoidSheetTimer = null; function openCustomAvoidInput() { diff --git a/web-admin/health-monitor/archive-algorithm.html b/web-admin/health-monitor/archive-algorithm.html index bf955f1..76e60b0 100644 --- a/web-admin/health-monitor/archive-algorithm.html +++ b/web-admin/health-monitor/archive-algorithm.html @@ -130,7 +130,7 @@