From 9dd968718464cd42e75dd9dc0223f8a22126a489 Mon Sep 17 00:00:00 2001 From: hwj Date: Wed, 4 Feb 2026 17:58:52 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E8=83=BD=E8=80=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=AD=E8=8B=B1=E6=96=87=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en.ts | 101 +++++++++++++++++ src/locales/zh-CN.ts | 101 +++++++++++++++++ .../mes/energydevice/EnergyDeviceForm.vue | 106 +++++++++++++----- src/views/mes/energydevice/ResetForm.vue | 27 ++--- .../EnergyDeviceCheckRecordForm.vue | 31 ++--- .../EnergyDeviceCheckRecordList.vue | 18 +-- src/views/mes/energydevice/index.vue | 71 ++++++++---- .../EnergyDeviceCheckRecordForm.vue | 48 ++++---- src/views/mes/energydevicecheck/index.vue | 48 ++++---- src/views/mes/energytype/EnergyTypeForm.vue | 49 +++++--- src/views/mes/energytype/index.vue | 80 +++++++++---- 11 files changed, 504 insertions(+), 176 deletions(-) diff --git a/src/locales/en.ts b/src/locales/en.ts index f198e8e8..2273fca2 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2713,6 +2713,107 @@ export default { validatorIsEnableRequired: 'Enabled can not be empty', exportFilename: 'EnergyType.xls', + }, + EnergyDeviceCheck: { + moduleName: 'Energy Report', + + searchNameLabel: 'Meter Name', + searchNamePlaceholder: 'Please enter meter name', + searchOrgLabel: 'Area', + searchOrgPlaceholder: 'Please select area', + searchTimeRangeLabel: 'Time Range', + searchTimeRangeStartPlaceholder: 'Please select start time', + searchTimeRangeEndPlaceholder: 'Please select end time', + + searchButtonText: 'Search', + resetButtonText: 'Reset', + exportButtonText: 'Export', + + tableExpandPointNameColumn: 'Parameter Name', + tableExpandEarliestValueColumn: 'Earliest Value', + tableExpandEarliestTimeColumn: 'Earliest Time', + tableExpandLatestValueColumn: 'Latest Value', + tableExpandLatestTimeColumn: 'Latest Time', + tableExpandDifferenceColumn: 'Energy Usage', + + tableNameColumn: 'Meter Name', + tableEnergyTypeColumn: 'Energy Type', + tableOrgColumn: 'Area', + tableEnergyConsumptionColumn: 'Energy Consumption', + tableStartTimeColumn: 'Start Time', + tableEndTimeColumn: 'End Time', + + exportFileName: 'EnergyReport.xls', + + dialogDeviceIdLabel: 'Energy Device ID', + dialogDeviceIdPlaceholder: 'Please enter energy device ID', + dialogLastCheckTimeLabel: 'Last Reading Time', + dialogLastCheckTimePlaceholder: 'Please select last reading time', + dialogLastCheckValueLabel: 'Last Reading', + dialogLastCheckValuePlaceholder: 'Please enter last reading', + dialogCheckTimeLabel: 'Reading Time', + dialogCheckTimePlaceholder: 'Please select reading time', + dialogCheckValueLabel: 'Reading', + dialogCheckValuePlaceholder: 'Please enter reading', + dialogDiffValueLabel: 'Difference', + dialogDiffValuePlaceholder: 'Please enter difference', + dialogUnitPriceLabel: 'Unit Price', + dialogUnitPricePlaceholder: 'Please enter unit price', + dialogRemarkLabel: 'Remark', + dialogRemarkPlaceholder: 'Please enter remark', + dialogOkButtonText: 'Confirm', + dialogCancelButtonText: 'Cancel', + + validatorDeviceIdRequired: 'Energy device ID cannot be empty', + validatorCheckValueRequired: 'Reading cannot be empty' + }, + EnergyDevice: { + moduleName: 'Energy Device', + + searchNameLabel: 'Device Name', + searchNamePlaceholder: 'Please enter device name', + searchEnergyTypeLabel: 'Energy Type', + searchEnergyTypePlaceholder: 'Please select energy type', + + searchButtonText: 'Search', + resetButtonText: 'Reset', + createButtonText: 'Add', + exportButtonText: 'Export', + + tableCodeColumn: 'Device Code', + tableNameColumn: 'Device Name', + tableEnergyTypeColumn: 'Energy Type', + tableOrgColumn: 'Area', + tableIsEnableColumn: 'Enabled', + tableUpdateTimeColumn: 'Update Time', + tableOperateColumn: 'Operation', + tableEditAction: 'Edit', + tableDeleteAction: 'Delete', + + exportFileName: 'EnergyDevice.xls', + + dialogCodeLabel: 'Device Code', + dialogCodePlaceholder: 'Please enter device code', + dialogNameLabel: 'Device Name', + dialogNamePlaceholder: 'Please enter device name', + dialogEnergyTypeLabel: 'Energy Type', + dialogEnergyTypePlaceholder: 'Please select energy type', + dialogOrgLabel: 'Area', + dialogOrgTreePlaceholder: 'Please select area', + dialogRulesLabel: 'Calculation Rule', + dialogRulesPointPlaceholder: 'Please select device point', + dialogOperatorPlaceholder: 'Please select operator', + dialogIsEnableLabel: 'Enabled', + dialogSubmitButtonText: 'Confirm', + dialogCancelButtonText: 'Cancel', + + validatorNameRequired: 'Device name cannot be empty', + validatorCodeRequired: 'Device code cannot be empty', + validatorOrgRequired: 'Area cannot be empty', + validatorIsEnableRequired: 'Enabled cannot be empty', + validatorRulesRequired: 'Calculation rule cannot be empty', + validatorRulesPointRequired: 'Device point cannot be empty', + validatorRulesOperatorRequired: 'Operator cannot be empty' } }, ProductionPlan: { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 2262b120..b94d1cbf 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -3672,6 +3672,107 @@ export default { exportFilename: '能耗类型.xls' }, + EnergyDeviceCheck: { + moduleName: '能源报表', + + searchNameLabel: '表名称', + searchNamePlaceholder: '请输入表名称', + searchOrgLabel: '所属区域', + searchOrgPlaceholder: '请选择所属区域', + searchTimeRangeLabel: '时间范围', + searchTimeRangeStartPlaceholder: '请选择开始时间', + searchTimeRangeEndPlaceholder: '请选择结束时间', + + searchButtonText: '查询', + resetButtonText: '重置', + exportButtonText: '导出', + + tableExpandPointNameColumn: '参数名称', + tableExpandEarliestValueColumn: '最早采集值', + tableExpandEarliestTimeColumn: '最早采集时间', + tableExpandLatestValueColumn: '最新值', + tableExpandLatestTimeColumn: '最新采集时间', + tableExpandDifferenceColumn: '能耗用量', + + tableNameColumn: '表名称', + tableEnergyTypeColumn: '能源类型', + tableOrgColumn: '所属区域', + tableEnergyConsumptionColumn: '能源用量', + tableStartTimeColumn: '开始时间', + tableEndTimeColumn: '结束时间', + + exportFileName: '能源报表.xls', + + dialogDeviceIdLabel: '能源设备Id', + dialogDeviceIdPlaceholder: '请输入能源设备Id', + dialogLastCheckTimeLabel: '上次抄表时间', + dialogLastCheckTimePlaceholder: '选择上次抄表时间', + dialogLastCheckValueLabel: '上次抄表值', + dialogLastCheckValuePlaceholder: '请输入上次抄表值', + dialogCheckTimeLabel: '抄表时间', + dialogCheckTimePlaceholder: '选择抄表时间', + dialogCheckValueLabel: '抄表值', + dialogCheckValuePlaceholder: '请输入抄表值', + dialogDiffValueLabel: '差值', + dialogDiffValuePlaceholder: '请输入差值', + dialogUnitPriceLabel: '单价', + dialogUnitPricePlaceholder: '请输入单价', + dialogRemarkLabel: '备注', + dialogRemarkPlaceholder: '请输入备注', + dialogOkButtonText: '确 定', + dialogCancelButtonText: '取 消', + + validatorDeviceIdRequired: '能源设备Id不能为空', + validatorCheckValueRequired: '抄表值不能为空' + }, + EnergyDevice: { + moduleName: '能源设备', + + searchNameLabel: '设备名称', + searchNamePlaceholder: '请输入设备名称', + searchEnergyTypeLabel: '能耗类型', + searchEnergyTypePlaceholder: '请选择能耗类型', + + searchButtonText: '搜索', + resetButtonText: '重置', + createButtonText: '新增', + exportButtonText: '导出', + + tableCodeColumn: '设备编码', + tableNameColumn: '设备名称', + tableEnergyTypeColumn: '能耗类型', + tableOrgColumn: '所属区域', + tableIsEnableColumn: '是否启用', + tableUpdateTimeColumn: '更新时间', + tableOperateColumn: '操作', + tableEditAction: '编辑', + tableDeleteAction: '删除', + + exportFileName: '能源设备.xls', + + dialogCodeLabel: '设备编码', + dialogCodePlaceholder: '请输入设备编码', + dialogNameLabel: '设备名称', + dialogNamePlaceholder: '请输入设备名称', + dialogEnergyTypeLabel: '能耗类型', + dialogEnergyTypePlaceholder: '请选择能耗类型', + dialogOrgLabel: '所属区域', + dialogOrgTreePlaceholder: '请选择所属区域', + dialogRulesLabel: '计算规则', + dialogRulesPointPlaceholder: '请选择设备点位', + dialogOperatorPlaceholder: '请选择运算符', + dialogIsEnableLabel: '是否启用', + dialogSubmitButtonText: '确 定', + dialogCancelButtonText: '取 消', + + validatorNameRequired: '设备名称不能为空', + validatorCodeRequired: '设备编码不能为空', + validatorOrgRequired: '所属区域不能为空', + validatorIsEnableRequired: '是否启用不能为空', + validatorRulesRequired: '计算规则不能为空', + validatorRulesPointRequired: '设备点位不能为空', + validatorRulesOperatorRequired: '运算符不能为空' + }, Device: { Device: { moduleName: '采集设备', diff --git a/src/views/mes/energydevice/EnergyDeviceForm.vue b/src/views/mes/energydevice/EnergyDeviceForm.vue index b1abd534..d24b648b 100644 --- a/src/views/mes/energydevice/EnergyDeviceForm.vue +++ b/src/views/mes/energydevice/EnergyDeviceForm.vue @@ -1,43 +1,81 @@ @@ -107,11 +149,11 @@ const formData = ref({ operationRulesVOList: [{ deviceId: undefined, pointId: undefined, operator: undefined, pointValue: undefined }], }) const formRules = reactive({ - name: [{ required: true, message: '表名称不能为空', trigger: 'blur' }], - code: [{ required: true, message: '表编码不能为空', trigger: 'blur' }], - orgId: [{ required: true, message: '所属区域不能为空', trigger: 'change' }], - operationRulesVOList: [{ required: true, validator: (_rule, _value, callback) => validateRules(callback), trigger: 'change' }], - isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] + name: [{ required: true, message: t('EnergyManagement.EnergyDevice.validatorNameRequired'), trigger: 'blur' }], + code: [{ required: true, message: t('EnergyManagement.EnergyDevice.validatorCodeRequired'), trigger: 'blur' }], + orgId: [{ required: true, message: t('EnergyManagement.EnergyDevice.validatorOrgRequired'), trigger: 'change' }], + operationRulesVOList: [{ required: true, validator: (_rule, _value, callback) => validateRules(callback), trigger: 'change' }], + isEnable: [{ required: true, message: t('EnergyManagement.EnergyDevice.validatorIsEnableRequired'), trigger: 'blur' }] }) const formRef = ref() // 表单 Ref @@ -441,20 +483,26 @@ const hydratePointValues = () => { const validateRules = (callback: any) => { const list = formData.value.operationRulesVOList ?? [] if (!list.length) { - callback(new Error('计算规则不能为空')) + callback(new Error(t('EnergyManagement.EnergyDevice.validatorRulesRequired'))) return } for (let i = 0; i < list.length; i++) { const r = list[i] as any if (!r?.deviceId || !r?.pointId) { - callback(new Error('请选择设备点位')) + callback(new Error(t('EnergyManagement.EnergyDevice.validatorRulesPointRequired'))) return } if (i > 0 && !list[i - 1]?.operator) { - callback(new Error('请选择运算符')) + callback(new Error(t('EnergyManagement.EnergyDevice.validatorRulesOperatorRequired'))) return } } callback() } + + diff --git a/src/views/mes/energydevice/ResetForm.vue b/src/views/mes/energydevice/ResetForm.vue index 5e79c3c2..2060c194 100644 --- a/src/views/mes/energydevice/ResetForm.vue +++ b/src/views/mes/energydevice/ResetForm.vue @@ -4,32 +4,33 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="100px" + label-width="auto" v-loading="formLoading" + class="energy-device-reset-dialog-form" > - - + + - - + + - + - - + + @@ -60,14 +61,14 @@ const formData = ref({ isEnable: undefined }) const formRules = reactive({ - isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }] + isEnable: [{ required: true, message: t('EnergyManagement.EnergyDevice.validatorIsEnableRequired'), trigger: 'blur' }] }) const formRef = ref() // 表单 Ref /** 打开弹窗 */ const open = async (type: string, id?: number) => { dialogVisible.value = true - dialogTitle.value = "重置最后抄表值" + dialogTitle.value = t('EnergyManagement.EnergyDeviceCheck.dialogLastCheckValueLabel') formType.value = type resetForm() // 修改时，设置数据 diff --git a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue index 9c89a580..5c04840d 100644 --- a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue +++ b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordForm.vue @@ -4,40 +4,41 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="100px" + label-width="auto" v-loading="formLoading" + class="energy-device-dialog-form" > - + - + - + - + @@ -45,23 +46,23 @@ - + - + - - + + @@ -87,8 +88,8 @@ const formData = ref({ remark: undefined }) const formRules = reactive({ - deviceId: [{ required: true, message: '能源设备Id不能为空', trigger: 'blur' }], - checkValue: [{ required: true, message: '抄表值不能为空', trigger: 'blur' }] + deviceId: [{ required: true, message: t('EnergyManagement.EnergyDeviceCheck.validatorDeviceIdRequired'), trigger: 'blur' }], + checkValue: [{ required: true, message: t('EnergyManagement.EnergyDeviceCheck.validatorCheckValueRequired'), trigger: 'blur' }] }) const formRef = ref() // 表单 Ref diff --git a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue index 00adc2ab..441b2752 100644 --- a/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue +++ b/src/views/mes/energydevice/components/EnergyDeviceCheckRecordList.vue @@ -12,7 +12,7 @@ - - - - - + + + + + - 删除 + {{ t('common.delMessage') }} diff --git a/src/views/mes/energydevice/index.vue b/src/views/mes/energydevice/index.vue index 4fbd141d..45182d3e 100644 --- a/src/views/mes/energydevice/index.vue +++ b/src/views/mes/energydevice/index.vue @@ -1,31 +1,50 @@