diff --git a/src/locales/en.ts b/src/locales/en.ts
index fea31a1d..f198e8e8 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -2668,6 +2668,53 @@ export default {
       manualTableRemarkColumn: 'Remark'
     }
   },
+  EnergyManagement: {
+    EnergyType: {
+      moduleName: 'Energy Type',
+
+      searchCodeLabel: 'Energy Type Code',
+      searchCodePlaceholder: 'Please enter energy type code',
+      searchNameLabel: 'Energy Type Name',
+      searchNamePlaceholder: 'Please enter energy type name',
+      searchUnitLabel: 'Unit',
+      searchUnitPlaceholder: 'Please enter unit',
+      searchCreateTimeLabel: 'Create Time',
+      searchCreateTimeStartPlaceholder: 'Start Date',
+      searchCreateTimeEndPlaceholder: 'End Date',
+
+      searchButtonText: 'Search',
+      resetButtonText: 'Reset',
+      addButtonText: 'Add',
+      exportButtonText: 'Export',
+
+      tableCodeColumn: 'Energy Type Code',
+      tableNameColumn: 'Energy Type Name',
+      tableUnitColumn: 'Unit',
+      tableIsEnableColumn: 'Enabled',
+      tableRemarkColumn: 'Remark',
+      tableCreateTimeColumn: 'Create Time',
+      tableOperateColumn: 'Operation',
+
+      dialogCodeLabel: 'Energy Type Code',
+      dialogCodePlaceholder: 'Please enter energy type code',
+      dialogNameLabel: 'Energy Type Name',
+      dialogNamePlaceholder: 'Please enter energy type name',
+      dialogUnitLabel: 'Unit',
+      dialogUnitPlaceholder: 'Please enter unit',
+      dialogIsEnableLabel: 'Enabled',
+      dialogRemarkLabel: 'Remark',
+      dialogRemarkPlaceholder: 'Please enter remark',
+      dialogOkButtonText: 'Confirm',
+      dialogCancelButtonText: 'Cancel',
+
+      validatorCodeRequired: 'Energy type code can not be empty',
+      validatorNameRequired: 'Energy type name can not be empty',
+      validatorUnitRequired: 'Unit can not be empty',
+      validatorIsEnableRequired: 'Enabled can not be empty',
+
+      exportFilename: 'EnergyType.xls',
+    }
+  },
   ProductionPlan: {
     Task: {
       moduleName: 'Production Task',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e7c9c1ea..2262b120 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -57,7 +57,7 @@ export default {
     copy: '复制',
     copySuccess: '复制成功',
     copyError: '复制失败',
-    code:'编码保存后自动生成'
+    code: '编码保存后自动生成'
   },
   ErpStock: {
     Warehouse: {
@@ -760,7 +760,8 @@ export default {
       emailInvalid: '请输入正确的邮箱地址',
       mobileInvalid: '请输入正确的手机号码',
       importFileRequired: '请上传文件',
-      importSuccessTip: '上传成功数量：{createCount}；更新成功数量：{updateCount}；更新失败数量：{failureCount}；',
+      importSuccessTip:
+        '上传成功数量：{createCount}；更新成功数量：{updateCount}；更新失败数量：{failureCount}；',
       importFailed: '上传失败，请您重新上传！',
       importFileLimit: '最多只能上传一个文件！',
       resetPasswordTitle: '请输入"{username}"的新密码',
@@ -1050,7 +1051,7 @@ export default {
       placeholderInspectionMethod: '请选择检验方式',
       placeholderValueType: '请选择值类型',
       placeholderUpperVal: '请输入上限值',
-      placeholderLowerVal: '请输入下限值',
+      placeholderLowerVal: '请输入下限值'
     },
 
     // 方案维护
@@ -3624,5 +3625,276 @@ export default {
       messageDeviceNoParams: '该设备下没有参数',
       messageFetchChartFailed: '获取图表数据失败'
     }
+  },
+  EnergyManagement: {
+    EnergyType: {
+      moduleName: '能耗类型',
+
+      searchCodeLabel: '能耗类型编码',
+      searchCodePlaceholder: '请输入能耗类型编码',
+      searchNameLabel: '能耗类型名称',
+      searchNamePlaceholder: '请输入能耗类型名称',
+      searchUnitLabel: '单位',
+      searchUnitPlaceholder: '请输入单位',
+      searchCreateTimeLabel: '创建时间',
+      searchCreateTimeStartPlaceholder: '开始日期',
+      searchCreateTimeEndPlaceholder: '结束日期',
+
+      searchButtonText: '搜索',
+      resetButtonText: '重置',
+      addButtonText: '新增',
+      exportButtonText: '导出',
+
+      tableCodeColumn: '能耗类型编码',
+      tableNameColumn: '能耗类型名称',
+      tableUnitColumn: '单位',
+      tableIsEnableColumn: '是否启用',
+      tableRemarkColumn: '备注',
+      tableCreateTimeColumn: '创建时间',
+      tableOperateColumn: '操作',
+
+      dialogCodeLabel: '能耗类型编码',
+      dialogCodePlaceholder: '请输入能耗类型编码',
+      dialogNameLabel: '能耗类型名称',
+      dialogNamePlaceholder: '请输入能耗类型名称',
+      dialogUnitLabel: '单位',
+      dialogUnitPlaceholder: '请输入单位',
+      dialogIsEnableLabel: '是否启用',
+      dialogRemarkLabel: '备注',
+      dialogRemarkPlaceholder: '请输入备注',
+      dialogOkButtonText: '确 定',
+      dialogCancelButtonText: '取 消',
+
+      validatorCodeRequired: '能耗类型编码不能为空',
+      validatorNameRequired: '能耗类型名称不能为空',
+      validatorUnitRequired: '单位不能为空',
+      validatorIsEnableRequired: '是否启用不能为空',
+
+      exportFilename: '能耗类型.xls'
+    },
+    Device: {
+      Device: {
+        moduleName: '采集设备',
+        index: '序号',
+
+        deviceCode: '设备编号',
+        deviceName: '设备名称',
+        operatingStatus: '运行状态',
+        protocol: '采集协议',
+        status: '连接状态',
+        sampleCycle: '采集周期(s)',
+        isEnable: '是否启用',
+        collectionTime: '采集时间',
+        operate: '操作',
+
+        search: '搜索',
+        reset: '重置',
+        create: '新增',
+        batchDelete: '批量删除',
+        export: '导出',
+
+        placeholderDeviceCode: '请输入设备编号',
+        placeholderDeviceName: '请输入设备名称',
+        placeholderModel: '请选择设备模型',
+        placeholderSampleCycle: '请输入采集周期',
+        placeholderUrl: '请输入端点URL',
+        placeholderUsername: '请输入用户名',
+        placeholderPassword: '请输入密码',
+
+        model: '设备模型',
+        url: '端点URL',
+        username: '用户名',
+        password: '密码',
+
+        settingDialogTitle: '设备设置',
+
+        connect: '连接',
+        disconnect: '断开连接',
+
+        attributeModuleName: '点位',
+        attributeCode: '点位编码',
+        attributeName: '点位名称',
+        attributeType: '点位类型',
+        dataType: '数据类型',
+        address: '寄存器地址',
+        dataUnit: '单位',
+        ratio: '倍率',
+        remark: '备注',
+        deviceAttributeTabLabel: '设备属性',
+        deviceRuleTabLabel: '点位规则',
+
+        currentDeviceLabel: '当前设备：',
+
+        alarmHistoryTitle: '设备告警历史数据',
+        alarmRuleName: '规则名称',
+        alarmPointName: '点位名称',
+        alarmPointValue: '点位值',
+        alarmLevel: '告警等级',
+        alarmTime: '告警时间',
+
+        emptyDescription: '请点击设备列表的“点位”查看采集点和点位规则',
+
+        exportFilename: '物联设备.xls',
+        attributeExportFilename: '采集设备-点位管理.xls',
+
+        attributeLatestValue: '最新值',
+        attributeLatestCollectionTime: '最新采集时间',
+        attributeSort: '顺序',
+        attributePlaceholderSort: '请输入顺序',
+
+        placeholderAttributeCode: '请输入点位编码',
+        placeholderAttributeName: '请输入点位名称',
+        placeholderAttributeType: '请选择点位类型',
+        placeholderDataType: '请选择数据类型',
+        placeholderAddress: '请输入寄存器地址',
+        placeholderDataUnit: '请输入单位',
+        placeholderRatio: '请输入倍率',
+        placeholderRemark: '请输入备注',
+
+        validatorDeviceCodeRequired: '设备编号不能为空',
+        validatorDeviceNameRequired: '设备名称不能为空',
+        validatorSampleCycleRequired: '采集周期不能为空',
+        validatorIsEnableRequired: '是否启用不能为空',
+        validatorUrlRequired: '端点URL不能为空',
+
+        attributeValidatorCodeRequired: '点位编码不能为空',
+        attributeValidatorNameRequired: '点位名称不能为空',
+        attributeValidatorCodeNoChinese: '点位编码不允许输入中文',
+        attributeValidatorSortNumber: '顺序只能输入数字',
+        attributeValidatorRemarkTooLong: '备注不能超过100字',
+
+        messageSelectDeviceRequired: '请选择一个物联设备',
+        messageDeviceInfoMissingForRules: '设备信息缺失，无法加载点位规则'
+      },
+      RunReport: {
+        moduleName: '设备运行报表',
+
+        searchDeviceCodeLabel: '设备编码',
+        searchDeviceCodePlaceholder: '请输入设备编码',
+        searchDeviceNameLabel: '设备名称',
+        searchDeviceNamePlaceholder: '请输入设备名称',
+        searchTimeRangeLabel: '设备运行时间',
+        searchTimeRangeStartPlaceholder: '开始时间',
+        searchTimeRangeEndPlaceholder: '结束时间',
+
+        searchButtonText: '搜索',
+        resetButtonText: '重置',
+        exportButtonText: '导出',
+
+        tableDeviceCodeColumn: '设备编码',
+        tableDeviceNameColumn: '设备名称',
+        tableRunningTimeColumn: '运行时间(小时)',
+        tableStandbyTimeColumn: '待机时间(小时)',
+        tableFaultTimeColumn: '故障时间(小时)',
+        tableWarningTimeColumn: '警告时间(小时)',
+        tableUtilizationRateColumn: '稼动率',
+        tableStartTimeColumn: '设备运行开始时间',
+        tableEndTimeColumn: '设备运行结束时间',
+
+        exportFilename: '设备运行报表.xls'
+      },
+      RealTimeMonitoring: {
+        moduleName: '数据实时监控',
+
+        searchLineCodeLabel: '产线编码',
+        searchLineCodePlaceholder: '请输入产线编码',
+        searchLineNameLabel: '产线名称',
+        searchLineNamePlaceholder: '请输入产线名称',
+        searchDeviceCodeLabel: '设备编码',
+        searchDeviceCodePlaceholder: '请输入设备编码',
+        searchDeviceNameLabel: '设备名称',
+        searchDeviceNamePlaceholder: '请输入设备名称',
+
+        searchButtonText: '搜索',
+        resetButtonText: '重置',
+        exportButtonText: '导出',
+
+        tableLineCodeColumn: '产线编码',
+        tableLineNameColumn: '产线名称',
+        tableDeviceCodeColumn: '设备编码',
+        tableDeviceNameColumn: '设备名称',
+        tableStatusColumn: '连接状态',
+        tableCollectionTimeColumn: '最新采集时间',
+        tableOperateColumn: '操作',
+        tableActionSingleMonitorLabel: '单设备监控',
+
+        dialogTitle: '单设备监控',
+        dialogDeviceNameLabel: '设备名称：',
+        dialogCollectionTimeLabel: '采集时间：',
+
+        emptyDescription: '暂无数据',
+        defaultGroupName: '默认',
+        defaultFieldLabelPrefix: '字段',
+
+        messageDeviceInfoIncomplete: '设备信息不完整',
+
+        exportFilename: '实时监控设备.xls'
+      },
+      HistoryData: {
+        moduleName: '历史记录查询',
+
+        searchLineCodeLabel: '产线编码',
+        searchLineCodePlaceholder: '请输入产线编码',
+        searchLineNameLabel: '产线名称',
+        searchLineNamePlaceholder: '请输入产线名称',
+        searchDeviceCodeLabel: '设备编码',
+        searchDeviceCodePlaceholder: '请输入设备编码',
+        searchDeviceNameLabel: '设备名称',
+        searchDeviceNamePlaceholder: '请输入设备名称',
+
+        searchButtonText: '搜索',
+        resetButtonText: '重置',
+        exportButtonText: '导出',
+
+        tableLineCodeColumn: '产线编码',
+        tableLineNameColumn: '产线名称',
+        tableDeviceCodeColumn: '设备编码',
+        tableDeviceNameColumn: '设备名称',
+        tableCollectionTimeColumn: '采集时间',
+        tableOperateColumn: '操作',
+        tableActionHistoryLabel: '历史记录',
+
+        dialogTitlePrefix: '历史记录：',
+        dialogCollectionTimeLabel: '采集时间',
+        dialogCollectionTimeStartPlaceholder: '开始时间',
+        dialogCollectionTimeEndPlaceholder: '结束时间',
+        dialogSearchButtonText: '查询',
+        dialogResetButtonText: '重置',
+        dialogRecordCollectionTimePrefix: '采集时间：',
+
+        emptyDescription: '暂无数据',
+        defaultFieldLabelPrefix: '字段',
+
+        exportFilename: '历史数据设备.xls'
+      },
+      DeviceParamAnalysis: {
+        moduleName: '设备运行参数分析',
+
+        treeSearchPlaceholder: '搜索设备或参数',
+
+        formTimeLabel: '时间',
+        formTimeStartPlaceholder: '开始日期',
+        formTimeEndPlaceholder: '结束日期',
+
+        shortcutLast7Days: '最近 7 天',
+        shortcutLastWeek: '上周',
+        shortcutLastMonth: '上个月',
+        shortcutLast3Months: '三个月内',
+
+        searchButtonText: '搜索',
+        resetButtonText: '重置',
+
+        emptyDescription: '暂无数据',
+        emptySelectNodeDescription: '请选择左侧节点',
+
+        selectedParamTitle: '节点：{label}{unit}',
+        defaultSeriesName: '参数',
+
+        messageLoadTreeFailed: '获取树数据失败',
+        messageNodeNoParams: '该节点下暂无参数',
+        messageDeviceNoParams: '该设备下没有参数',
+        messageFetchChartFailed: '获取图表数据失败'
+      }
+    }
   }
 }
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 66b45ada..3112ce45 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -881,7 +881,7 @@ const runningRuleOptions = [
   { value: '1', label: '运行' },
   { value: '2', label: '待机中（不运行、没故障）' },
   { value: '3', label: '故障中（故障且待机）' },
-  { value: '4', label: '报警中（故障且运行）' },
+  // { value: '4', label: '报警中（故障且运行）' },
 ]
 
 const alarmRuleOptions = [{ value: '5', label: '报警' }]
diff --git a/src/views/iot/runReport/index.vue b/src/views/iot/runReport/index.vue
index b2c99d44..746af596 100644
--- a/src/views/iot/runReport/index.vue
+++ b/src/views/iot/runReport/index.vue
@@ -85,12 +85,12 @@
         prop="totalFaultTime"
         min-width="140px"
       />
-      <el-table-column
+      <!-- <el-table-column
         :label="t('DataCollection.RunReport.tableWarningTimeColumn')"
         align="center"
         prop="totalWarningTime"
         min-width="140px"
-      />
+      /> -->
       <el-table-column
         :label="t('DataCollection.RunReport.tableUtilizationRateColumn')"
         align="center"
@@ -117,6 +117,7 @@
 </template>
 
 <script setup lang="ts">
+import dayjs from 'dayjs'
 import download from '@/utils/download'
 import { DeviceOperationRecordApi, type DeviceOperationRecordVO, type DeviceOperationRecordPageParams } from '@/api/iot/deviceOperationRecord'
 
@@ -134,7 +135,10 @@ const queryParams = reactive({
   pageSize: 10,
   deviceCode: undefined as string | undefined,
   deviceName: undefined as string | undefined,
-  timeRange: [] as string[] | [],
+  timeRange: [
+    dayjs().subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  ] as string[],
   startTime: undefined as string | undefined,
   endTime: undefined as string | undefined,
   ids: undefined as string | undefined