From 3d79f40c91ae3e2a20a9555aee4823b779d4dd10 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Fri, 27 Mar 2026 14:29:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E8=AE=BE=E5=A4=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en.ts | 22 +- src/locales/zh-CN.ts | 21 +- .../components/FormulaLibraryDetailTabs.vue | 28 +- src/views/iot/device/index.vue | 370 +++++- src/views/mes/deviceledger/index.vue | 1016 +++++++++++++---- 5 files changed, 1211 insertions(+), 246 deletions(-) diff --git a/src/locales/en.ts b/src/locales/en.ts index af7f1607..524e1fc5 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2983,7 +2983,22 @@ export default { manualTableDataTypeColumn: 'Data Type', manualTableDataUnitColumn: 'Unit', manualTableReferColumn: 'Reference Value', - manualTableRemarkColumn: 'Remark' + manualTableRemarkColumn: 'Remark', + manualTableInputTimeColumn: 'Input Time', + manualTableEnteringAction:'Re-enroll', + manualFormTitleLabel: 'Re-recorded collected values', + nanualFormNameLabel:'Name', + nanualFormNamePlaceholder:'Please enter name', + nanualFormDataTypeLabel:'Data Type', + nanualFormDataTypePlaceholder:'Please select data type', + nanualFormDataUnitLabel:'Unit', + nanualFormDataUnitPlaceholder:'Please select unit', + nanualFormReferLabel:'Reference Value', + nanualFormReferPlaceholder:'Please enter reference value', + nanualFormRemarkLabel:'Remark', + nanualFormRemarkPlaceholder:'Please enter remark', + nanualFormInputTimeLabel:'Input Time', + nanualFormInputTimePlaceholder:'Please select input time', } }, EnergyManagement: { @@ -3974,7 +3989,10 @@ export default { attributeValidatorRemarkTooLong: 'Remark can not exceed 100 characters', messageSelectDeviceRequired: 'Please select a device', - messageDeviceInfoMissingForRules: 'Device information is missing, unable to load point rules' + messageDeviceInfoMissingForRules: 'Device information is missing, unable to load point rules', + + gridView:'gridView', + sudoku:'sudoku', }, RunReport: { moduleName: 'Device Operation Report', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 8e0409cc..3c0ec079 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -2504,7 +2504,21 @@ export default { manualTableDataTypeColumn: '数据类型', manualTableDataUnitColumn: '单位', manualTableReferColumn: '参考值', - manualTableRemarkColumn: '备注' + manualTableRemarkColumn: '备注', + manualTableInputTimeColumn: '录入时间', + manualTableEnteringAction: '补录', + manualFormTitleLabel: '补录采集值', + nanualFormNameLabel: '名称', + nanualFormNamePlaceholder: '请输入名称', + nanualFormDataTypeLabel: '数据类型', + nanualFormDataTypePlaceholder: '请输入数据类型', + nanualFormDataUnitLabel: '单位', + nanualFormDataUnitPlaceholder: '请选择单位', + nanualFormReferLabel: '参考值', + nanualFormReferPlaceholder: '请输入参考值', + nanualFormRemarkLabel: '备注', + nanualFormRemarkPlaceholder: '请输入备注', + } }, FactoryModeling: { @@ -3813,7 +3827,10 @@ export default { attributeValidatorRemarkTooLong: '备注不能超过100字', messageSelectDeviceRequired: '请选择一个物联设备', - messageDeviceInfoMissingForRules: '设备信息缺失,无法加载点位规则' + messageDeviceInfoMissingForRules: '设备信息缺失,无法加载点位规则', + + gridView:'表格视图', + sudoku:'九宫格', }, RunReport: { moduleName: '设备运行报表', diff --git a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue index 976d7b37..435ada21 100644 --- a/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue +++ b/src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue @@ -138,14 +138,14 @@ prop="remark" min-width="180" /> - + - + @@ -158,19 +158,19 @@ - + - - + + - - + + - - + + - - + + - - + +