diff --git a/admin-console/src/views/RecordView.vue b/admin-console/src/views/RecordView.vue index fda4273..6205e46 100644 --- a/admin-console/src/views/RecordView.vue +++ b/admin-console/src/views/RecordView.vue @@ -73,7 +73,7 @@ import { exportCSV } from '../utils/export' import { formatDate as formatDateUtil } from '../utils/format' var REGION_MAP = { - 1: '左脸', 2: '右脸', 4: '额头', 8: '下巴', 16: '鼻', 32: '左眼', 64: '右眼' + 1: '左区', 2: '右区', 4: '上区', 8: '下区', 16: '中区', 32: '左上区', 64: '右上区' } export default { @@ -168,7 +168,7 @@ export default { async onExport() { try { const data = await get('/api/v1/admin/records', { page: 1, page_size: 9999, keyword: this.keyword, user_id: this.filterUserId, date_from: this.dateFrom, date_to: this.dateTo }) - var REGION_MAP = { 1: '左脸', 2: '右脸', 4: '额头', 8: '下巴', 16: '鼻', 32: '左眼', 64: '右眼' } + var REGION_MAP = { 1: '左区', 2: '右区', 4: '上区', 8: '下区', 16: '中区', 32: '左上区', 64: '右上区' } const records = data.records || [] exportCSV('records_' + new Date().toISOString().slice(0, 10) + '.csv', ['记录ID', '用户', '设备编号', '使用模式', '使用区域', '使用时长(分钟)', '使用时间'], diff --git a/miniprogram/pages/auto-scan/auto-scan.wxml b/miniprogram/pages/auto-scan/auto-scan.wxml index 456f43e..09584e7 100644 --- a/miniprogram/pages/auto-scan/auto-scan.wxml +++ b/miniprogram/pages/auto-scan/auto-scan.wxml @@ -2,11 +2,11 @@ ‹ 返回 自动扫描 - 正在识别面部... + 正在识别区域... - 自动扫描面部区域 + 自动扫描区域 @@ -14,7 +14,7 @@ - 请将面罩对准面部 + 请正确佩戴设备 连接设备后可获取检测数据 diff --git a/miniprogram/pages/treating/treating.js b/miniprogram/pages/treating/treating.js index 54ae2e2..6f6a970 100644 --- a/miniprogram/pages/treating/treating.js +++ b/miniprogram/pages/treating/treating.js @@ -16,17 +16,17 @@ Page({ paused: false, completed: false, startedAt: 0, - regionText: '全脸使用', + regionText: '全区域', }, _getRegionText: function (regionMask) { - var REGION_MAP = {1:'左脸', 2:'右脸', 4:'额头', 8:'下巴', 16:'鼻', 32:'左眼', 64:'右眼'} - if (regionMask === 0x7F) return '全脸使用' + var REGION_MAP = {1:'左区', 2:'右区', 4:'上区', 8:'下区', 16:'中区', 32:'左上区', 64:'右上区'} + if (regionMask === 0x7F) return '全区域' var names = [] for (var bit in REGION_MAP) { if (regionMask & parseInt(bit)) names.push(REGION_MAP[bit]) } - return names.length > 0 ? names.join('+') + '使用' : '全脸使用' + return names.length > 0 ? names.join('+') : '全区域' }, onLoad: function (options) { diff --git a/miniprogram/pages/treatment-setup/treatment-setup.js b/miniprogram/pages/treatment-setup/treatment-setup.js index 2a7ca97..a73f5a2 100644 --- a/miniprogram/pages/treatment-setup/treatment-setup.js +++ b/miniprogram/pages/treatment-setup/treatment-setup.js @@ -3,11 +3,11 @@ Page({ data: { statusBarHeight: 44, regions: [ - { name: '左脸颊', mask: 0x01, checked: true }, - { name: '右脸颊', mask: 0x02, checked: true }, - { name: '额头', mask: 0x04, checked: true }, - { name: '下巴', mask: 0x08, checked: true }, - { name: '鼻唇', mask: 0x10, checked: true } + { name: '左区', mask: 0x01, checked: true }, + { name: '右区', mask: 0x02, checked: true }, + { name: '上区', mask: 0x04, checked: true }, + { name: '下区', mask: 0x08, checked: true }, + { name: '中区', mask: 0x10, checked: true } ], selectedMode: 0, subExpired: false, diff --git a/miniprogram/pages/treatment-setup/treatment-setup.wxml b/miniprogram/pages/treatment-setup/treatment-setup.wxml index 45335f7..c9385a5 100644 --- a/miniprogram/pages/treatment-setup/treatment-setup.wxml +++ b/miniprogram/pages/treatment-setup/treatment-setup.wxml @@ -23,14 +23,14 @@ 选择区域 - 普通模式固定 10 分钟,使用区域默认全脸,不可调整 + 普通模式固定 10 分钟,使用区域默认全区域,不可调整 - 额头 - 左脸 - 右脸 - 鼻唇 - 下巴 + 上区 + 左区 + 右区 + 中区 + 下区