diff --git a/src/api/ems/record/recordAlarmData.ts b/src/api/ems/record/recordAlarmData.ts
index 5960a7c..09daa50 100644
--- a/src/api/ems/record/recordAlarmData.ts
+++ b/src/api/ems/record/recordAlarmData.ts
@@ -1,5 +1,14 @@
 import request from '@/utils/request';
-import type { EmsActionResponse, EmsDetailResponse, EmsRecordAlarmDataVO, EmsId, EmsIdParam, EmsListResponse, EmsQuery } from '../types';
+import type {
+  AlarmOverviewSummaryVO,
+  EmsActionResponse,
+  EmsDetailResponse,
+  EmsRecordAlarmDataVO,
+  EmsId,
+  EmsIdParam,
+  EmsListResponse,
+  EmsQuery
+} from '../types';
 
 // 查询异常数据记录列表
 export function listRecordAlarmData(query?: EmsQuery): Promise<EmsListResponse<EmsRecordAlarmDataVO>> {
@@ -18,6 +27,15 @@ export function getRecordAlarmData(objId: EmsId): Promise<EmsDetailResponse<EmsR
   });
 }
 
+// 查询报警中心统计概览
+export function getRecordAlarmDataSummary(query?: EmsQuery): Promise<EmsDetailResponse<AlarmOverviewSummaryVO>> {
+  return request({
+    url: '/ems/record/recordAlarmData/summary',
+    method: 'get',
+    params: query
+  });
+}
+
 // 新增异常数据记录
 export function addRecordAlarmData(data: EmsRecordAlarmDataVO): Promise<EmsActionResponse<EmsRecordAlarmDataVO>> {
   return request({
diff --git a/src/api/ems/types.ts b/src/api/ems/types.ts
index d8b82ad..98577f5 100644
--- a/src/api/ems/types.ts
+++ b/src/api/ems/types.ts
@@ -214,6 +214,8 @@ export interface EmsEntity extends BaseEntity {
   createdTime?: EmsDateValue;
   updatedAt?: EmsDateValue;
   updatedTime?: EmsDateValue;
+  createTime?: EmsDateValue;
+  updateTime?: EmsDateValue;
   parentId?: EmsId;
   parentName?: string;
   orderNum?: number;
@@ -563,6 +565,16 @@ export interface EmsRecordAlarmDataVO extends EmsEntity {
   confirmRemark?: string;
 }
 
+export interface AlarmOverviewSummaryVO extends EmsEntity {
+  totalCount?: EmsId;
+  unhandledCount?: EmsId;
+  handledCount?: EmsId;
+  pushPendingCount?: EmsId;
+  pushProcessingCount?: EmsId;
+  pushSuccessCount?: EmsId;
+  pushFailCount?: EmsId;
+}
+
 export interface EmsRecordAlarmRuleVO extends EmsEntity {
   objId?: EmsId;
   ruleId?: string;
@@ -592,6 +604,140 @@ export interface EmsRecordAlarmRuleVO extends EmsEntity {
   isEnable?: string;
 }
 
+export interface AlarmNotifyGroupVO extends EmsEntity {
+  id?: EmsId;
+  groupName?: string;
+  notifyChannel?: string;
+  webhookUrl?: string;
+  isEnable?: string;
+  remark?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface AlarmNotifyGroupUserVO extends EmsEntity {
+  id?: EmsId;
+  groupId?: EmsId;
+  groupName?: string;
+  userId?: EmsId;
+  userName?: string;
+  nickName?: string;
+  phone?: string;
+  email?: string;
+  isEnable?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface AlarmPushLogVO extends EmsEntity {
+  id?: EmsId;
+  alarmObjId?: EmsId;
+  alarmTitle?: string;
+  monitorCode?: string;
+  monitorName?: string;
+  channelType?: string;
+  targetValue?: string;
+  alarmLevel?: string;
+  pushContent?: string;
+  pushStatus?: string;
+  responseMsg?: string;
+  pushTime?: EmsDateValue;
+}
+
+export interface MonitorMetricThresholdVO extends EmsEntity {
+  id?: EmsId;
+  monitorCode?: string;
+  monitorName?: string;
+  metricCode?: string;
+  warnUpper?: EmsDecimalValue;
+  warnLower?: EmsDecimalValue;
+  alarmUpper?: EmsDecimalValue;
+  alarmLower?: EmsDecimalValue;
+  hysteresis?: EmsDecimalValue;
+  durationSec?: EmsId;
+  alarmLevel?: string;
+  notifyGroupId?: EmsId;
+  notifyGroupName?: string;
+  isEnable?: string;
+  remark?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface DataExportTaskVO extends EmsEntity {
+  id?: EmsId;
+  exportType?: string;
+  monitorCode?: string;
+  monitorName?: string;
+  metricCode?: string;
+  timeStart?: EmsDateValue;
+  timeEnd?: EmsDateValue;
+  exportCondition?: string;
+  fileFormat?: string;
+  fileName?: string;
+  fileUrl?: string;
+  exportStatus?: string;
+  remark?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface IntegrationEndpointVO extends EmsEntity {
+  id?: EmsId;
+  endpointName?: string;
+  endpointType?: string;
+  accessMode?: string;
+  host?: string;
+  port?: EmsId;
+  configJson?: string;
+  status?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface IntegrationPointMapVO extends EmsEntity {
+  id?: EmsId;
+  endpointId?: EmsId;
+  endpointName?: string;
+  monitorCode?: string;
+  monitorName?: string;
+  metricCode?: string;
+  sourcePointCode?: string;
+  targetPointCode?: string;
+  transformScript?: string;
+  dataFormat?: string;
+  isEnable?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface ControlCommandLogVO extends EmsEntity {
+  id?: EmsId;
+  endpointId?: EmsId;
+  endpointName?: string;
+  monitorCode?: string;
+  monitorName?: string;
+  commandType?: string;
+  commandContent?: string;
+  executeStatus?: string;
+  responseContent?: string;
+  createTime?: EmsDateValue;
+}
+
+export interface ReportPeriodSummaryVO extends EmsEntity {
+  id?: EmsId;
+  monitorCode?: string;
+  monitorName?: string;
+  metricCode?: string;
+  metricName?: string;
+  periodType?: string;
+  periodStart?: EmsDateValue;
+  periodEnd?: EmsDateValue;
+  beginValue?: EmsDecimalValue;
+  endValue?: EmsDecimalValue;
+  avgValue?: EmsDecimalValue;
+  maxValue?: EmsDecimalValue;
+  minValue?: EmsDecimalValue;
+  consumeValue?: EmsDecimalValue;
+  overLimitDuration?: EmsId;
+  alarmCount?: EmsId;
+  sampleCount?: EmsId;
+}
+
 export interface EmsRecordDnbInstantVO extends EmsEntity {
   objId?: EmsId;
   monitorCode?: string;
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index caffecc..4d5855a 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -19,11 +19,26 @@ export const listUser = (query: UserQuery): AxiosPromise<UserVO[]> => {
 
 /**
  * 通过用户ids查询用户
- * @param userIds
+ * 这里兼容两种调用方式：
+ * 1. 传用户ID数组，延续后端 Long[] userIds 原有的逗号串绑定方式
+ * 2. 只传部门ID，便于部门切换场景直接复用同一个接口
  */
-export const optionSelect = (userIds: (number | string)[]): AxiosPromise<UserVO[]> => {
+export const optionSelect = (userIdsOrDeptId?: (number | string)[] | number | string, deptId?: number | string): AxiosPromise<UserVO[]> => {
+  const queryParts: string[] = [];
+  if (Array.isArray(userIdsOrDeptId)) {
+    if (userIdsOrDeptId.length > 0) {
+      queryParts.push('userIds=' + encodeURIComponent(userIdsOrDeptId.join(',')));
+    }
+    if (deptId !== undefined && deptId !== null && deptId !== '') {
+      queryParts.push('deptId=' + encodeURIComponent(String(deptId)));
+    }
+  } else if (userIdsOrDeptId !== undefined && userIdsOrDeptId !== null && userIdsOrDeptId !== '') {
+    queryParts.push('deptId=' + encodeURIComponent(String(userIdsOrDeptId)));
+  }
+
+  const url = queryParts.length > 0 ? `/system/user/optionselect?${queryParts.join('&')}` : '/system/user/optionselect';
   return request({
-    url: '/system/user/optionselect?userIds=' + userIds,
+    url,
     method: 'get'
   });
 };
diff --git a/src/views/ems/base/baseCollectDeviceInfo/index.vue b/src/views/ems/base/baseCollectDeviceInfo/index.vue
index 39284b9..92e9ff2 100644
--- a/src/views/ems/base/baseCollectDeviceInfo/index.vue
+++ b/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -12,16 +12,16 @@
       <el-form-item label="采集设备名称" prop="collectDeviceName">
         <el-input v-model="queryParams.collectDeviceName" placeholder="请输入采集设备名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <!--      <el-form-item label="能源类型" prop="energyTypeId">-->
-      <!--        <el-select v-model="queryParams.energyTypeId" placeholder="请选择能源类型">-->
-      <!--          <el-option-->
-      <!--            v-for="item in energyTypeList"-->
-      <!--            :key="item.energyTypeId"-->
-      <!--            :label="item.energyName"-->
-      <!--            :value="item.energyTypeId"-->
-      <!--          ></el-option>-->
-      <!--        </el-select>-->
-      <!--      </el-form-item>-->
+      <el-form-item label="能源类型" prop="energyTypeId">
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择能源类型" clearable>
+          <el-option
+            v-for="item in energyTypeList"
+            :key="item.energyTypeId"
+            :label="item.energyName"
+            :value="item.energyTypeId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="启用标识" prop="isFlag">
         <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
           <el-option v-for="dict in dict.type.is_flag" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -79,7 +79,7 @@
 
     <el-table v-loading="loading" :data="baseCollectDeviceInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible" />
+      <el-table-column label="序号" type="index" width="60" align="center" v-if="columns[0].visible" />
       <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[1].visible" />
       <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible" />
       <el-table-column label="能源类型" align="center" prop="energyTypeName" v-if="columns[3].visible" />
@@ -126,16 +126,16 @@
         <el-form-item label="采集设备名称" prop="collectDeviceName">
           <el-input v-model="form.collectDeviceName" placeholder="请输入采集设备名称" />
         </el-form-item>
-        <!--        <el-form-item label="能源类型" prop="energyTypeId">-->
-        <!--          <el-select v-model="form.energyTypeId" placeholder="请选择能源类型编号">-->
-        <!--            <el-option-->
-        <!--              v-for="item in energyTypeList"-->
-        <!--              :key="item.energyTypeId"-->
-        <!--              :label="item.energyName"-->
-        <!--              :value="item.energyTypeId"-->
-        <!--            ></el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择能源类型" style="width: 100%">
+            <el-option
+              v-for="item in energyTypeList"
+              :key="item.energyTypeId"
+              :label="item.energyName"
+              :value="item.energyTypeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="型号" prop="model">
           <el-input v-model="form.model" placeholder="请输入型号" />
         </el-form-item>
@@ -356,16 +356,16 @@ const createFormData = (): BaseCollectDeviceInfoForm => ({
 const form = ref<BaseCollectDeviceInfoForm>(createFormData());
 
 const rules = reactive<ElFormRules>({
-  objId: [{ required: true, message: '自增标识不能为空', trigger: 'blur' }],
   collectDeviceId: [{ required: true, message: '采集设备编号不能为空', trigger: 'blur' }],
-  collectDeviceName: [{ required: true, message: '采集设备名称不能为空', trigger: 'blur' }]
+  collectDeviceName: [{ required: true, message: '采集设备名称不能为空', trigger: 'blur' }],
+  energyTypeId: [{ required: true, message: '能源类型不能为空', trigger: 'change' }]
 });
 
 const columns: FieldOption[] = [
-  { key: 0, label: '自增标识', visible: false },
+  { key: 0, label: '序号', visible: true },
   { key: 1, label: '采集设备编号', visible: true },
   { key: 2, label: '采集设备名称', visible: true },
-  { key: 3, label: '能源类型', visible: false },
+  { key: 3, label: '能源类型', visible: true },
   { key: 4, label: '型号', visible: true },
   { key: 5, label: '生产厂家', visible: true },
   { key: 6, label: '通讯地址', visible: true },
@@ -390,7 +390,7 @@ const getList = async () => {
 /** 查询能源类型下拉选项，避免页面初始化时出现空白下拉 */
 const getEnergyTypeList = async () => {
   const response = await getBaseEnergyTypeList({});
-  energyTypeList.value = (response.rows ?? []) as EnergyTypeOption[];
+  energyTypeList.value = ((response.data ?? response.rows ?? []) as EnergyTypeOption[]) || [];
 };
 
 // 取消按钮
diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index d0a7c2e..7a6fc6d 100644
--- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -63,7 +63,7 @@
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="父级编号" prop="parentId" v-if="columns[0].visible" />
+      <el-table-column label="序号" type="index" width="60" align="center" v-if="columns[0].visible" />
       <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[1].visible" />
       <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[2].visible" />
       <!-- <el-table-column label="能源类型" align="center" prop="monitorType" v-if="columns[4].visible">
@@ -590,8 +590,8 @@ const state = reactive({
     // { key: 0, label: `自增标识`, visible: false },
     {
       key: 0,
-      label: `父级编号`,
-      visible: false
+      label: `序号`,
+      visible: true
     },
     {
       key: 1,
diff --git a/src/views/ems/base/emsAlarmActionStep/index.vue b/src/views/ems/base/emsAlarmActionStep/index.vue
index 8febb44..75470d3 100644
--- a/src/views/ems/base/emsAlarmActionStep/index.vue
+++ b/src/views/ems/base/emsAlarmActionStep/index.vue
@@ -1,104 +1,86 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryFormRef" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)" prop="ruleObjId">
-        <el-input
-          v-model="queryParams.ruleObjId"
-          placeholder="请输入关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+    <el-form :model="queryParams" ref="queryFormRef" size="small" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="关联规则" prop="ruleObjId">
+        <el-select v-model="queryParams.ruleObjId" placeholder="请选择关联规则" clearable filterable style="width: 260px">
+          <el-option v-for="item in recordAlarmRuleList" :key="item.objId" :label="item.ruleName" :value="item.objId" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="步骤顺序，从1开始" prop="stepSequence">
-        <el-input v-model="queryParams.stepSequence" placeholder="请输入步骤顺序，从1开始" clearable @keyup.enter="handleQuery" />
+      <el-form-item label="步骤顺序" prop="stepSequence">
+        <el-input-number v-model="queryParams.stepSequence" :min="1" :precision="0" controls-position="right" style="width: 180px" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ems/base:emsAlarmActionStep:add']"
-          >新增</el-button
-        >
+        <el-button type="primary" plain icon="el-icon-plus" size="small" @click="handleAdd" v-hasPermi="['ems/base:emsAlarmActionStep:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['ems/base:emsAlarmActionStep:edit']"
-          >修改</el-button
-        >
+        <el-button type="success" plain icon="el-icon-edit" size="small" :disabled="single" @click="handleUpdate" v-hasPermi="['ems/base:emsAlarmActionStep:edit']">
+          修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
           plain
           icon="el-icon-delete"
-          size="mini"
+          size="small"
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['ems/base:emsAlarmActionStep:remove']"
-          >删除</el-button
         >
+          删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['ems/base:emsAlarmActionStep:export']"
-          >导出</el-button
-        >
+        <el-button type="warning" plain icon="el-icon-download" size="small" @click="handleExport" v-hasPermi="['ems/base:emsAlarmActionStep:export']">
+          导出
+        </el-button>
       </el-col>
-      <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+      <right-toolbar v-model:show-search="showSearch" :columns="columns" @query-table="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="emsAlarmActionStepList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键ID" align="center" prop="objId" />
-      <el-table-column label="关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)" align="center" prop="ruleObjId"> </el-table-column>
-      <el-table-column label="步骤顺序，从1开始" align="center" prop="stepSequence"> </el-table-column>
-      <el-table-column label="步骤文字描述" align="center" prop="description"> </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark"> </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column v-if="columns[0].visible" label="序号" type="index" width="60" align="center" />
+      <el-table-column v-if="columns[1].visible" label="关联规则" align="center" min-width="220" show-overflow-tooltip>
         <template #default="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems/base:emsAlarmActionStep:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ems/base:emsAlarmActionStep:remove']"
-            >删除</el-button
-          >
+          {{ resolveRuleName(scope.row.ruleObjId) }}
+        </template>
+      </el-table-column>
+      <el-table-column v-if="columns[2].visible" label="步骤顺序" align="center" prop="stepSequence" width="120" />
+      <el-table-column v-if="columns[3].visible" label="步骤描述" align="center" prop="description" min-width="260" show-overflow-tooltip />
+      <el-table-column v-if="columns[4].visible" label="备注" align="center" prop="remark" min-width="220" show-overflow-tooltip />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template #default="scope">
+          <el-button size="small" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems/base:emsAlarmActionStep:edit']">修改</el-button>
+          <el-button size="small" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['ems/base:emsAlarmActionStep:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 添加或修改报警规则具体措施步骤对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)" prop="ruleObjId">
-          <!-- <el-input v-model="form.ruleObjId" placeholder="请输入关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)" /> -->
-          <el-select v-model="form.ruleObjId" placeholder="请选择关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)">
+    <el-dialog :title="title" v-model="open" width="560px" append-to-body>
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="96px">
+        <el-form-item label="关联规则" prop="ruleObjId">
+          <el-select v-model="form.ruleObjId" placeholder="请选择关联规则" filterable style="width: 100%">
             <el-option v-for="item in recordAlarmRuleList" :key="item.objId" :label="item.ruleName" :value="item.objId" />
           </el-select>
         </el-form-item>
-        <el-form-item label="步骤顺序，从1开始" prop="stepSequence">
-          <el-input v-model="form.stepSequence" placeholder="请输入步骤顺序，从1开始" />
+        <el-form-item label="步骤顺序" prop="stepSequence">
+          <el-input-number v-model="form.stepSequence" :min="1" :precision="0" controls-position="right" style="width: 100%" />
         </el-form-item>
-        <el-form-item label="步骤文字描述" prop="description">
-          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="步骤描述" prop="description">
+          <el-input v-model="form.description" type="textarea" :rows="4" placeholder="请输入步骤描述" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -112,14 +94,9 @@
 </template>
 
 <script setup lang="ts">
-import {
-  listEmsAlarmActionStep,
-  getEmsAlarmActionStep,
-  delEmsAlarmActionStep,
-  addEmsAlarmActionStep,
-  updateEmsAlarmActionStep
-} from '@/api/ems/base/emsAlarmActionStep';
+import { listEmsAlarmActionStep, getEmsAlarmActionStep, delEmsAlarmActionStep, addEmsAlarmActionStep, updateEmsAlarmActionStep } from '@/api/ems/base/emsAlarmActionStep';
 import { getEmsRecordAlarmRuleList } from '@/api/ems/record/recordAlarmRule';
+import type { EmsAlarmActionStepVO, EmsRecordAlarmRuleVO } from '@/api/ems/types';
 
 defineOptions({
   name: 'EmsAlarmActionStep'
@@ -130,11 +107,18 @@ const { proxy } = getCurrentInstance() as any;
 const formRef = ref<any>();
 const queryFormRef = ref<any>();
 
-// 这里统一通过工厂函数重建表单，避免弹窗在新增/编辑切换时残留上一条业务数据。
+const columns = ref<FieldOption[]>([
+  { key: 0, label: '序号', visible: true, children: [] },
+  { key: 1, label: '关联规则', visible: true, children: [] },
+  { key: 2, label: '步骤顺序', visible: true, children: [] },
+  { key: 3, label: '步骤描述', visible: true, children: [] },
+  { key: 4, label: '备注', visible: true, children: [] }
+]);
+
 const createFormData = () => ({
   objId: null,
   ruleObjId: null,
-  stepSequence: null,
+  stepSequence: 1,
   description: null,
   createBy: null,
   createTime: null,
@@ -143,29 +127,17 @@ const createFormData = () => ({
   remark: null
 });
 
-// 这里保留原页面字段结构，优先保证 EMS 业务行为与接口入参不发生漂移。
 const state = reactive({
-  // 遮罩层
   loading: true,
-  // 选中数组
   ids: [],
-  // 报警规则列表
-  recordAlarmRuleList: [],
-  // 非单个禁用
+  recordAlarmRuleList: [] as EmsRecordAlarmRuleVO[],
   single: true,
-  // 非多个禁用
   multiple: true,
-  // 显示搜索条件
   showSearch: true,
-  // 总条数
   total: 0,
-  // 报警规则具体措施步骤表格数据
-  emsAlarmActionStepList: [],
-  // 弹出层标题
+  emsAlarmActionStepList: [] as EmsAlarmActionStepVO[],
   title: '',
-  // 是否显示弹出层
   open: false,
-  // 查询参数
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -173,42 +145,31 @@ const state = reactive({
     stepSequence: null,
     description: null
   },
-  // 表单参数
   form: createFormData(),
-  // 表单校验
   rules: {
-    ruleObjId: [
-      {
-        required: true,
-        message: '关联的报警规则ID (逻辑关联 ems_record_alarm_rule.obj_id)不能为空',
-        trigger: 'blur'
-      }
-    ],
-    stepSequence: [
-      {
-        required: true,
-        message: '步骤顺序，从1开始不能为空',
-        trigger: 'blur'
-      }
-    ]
+    ruleObjId: [{ required: true, message: '关联规则不能为空', trigger: 'change' }],
+    stepSequence: [{ required: true, message: '步骤顺序不能为空', trigger: 'blur' }],
+    description: [{ required: true, message: '步骤描述不能为空', trigger: 'blur' }]
   }
 } as any);
 
-const { emsAlarmActionStepList, form, ids, loading, multiple, open, queryParams, recordAlarmRuleList, rules, showSearch, single, title, total } =
-  toRefs(state);
+const { emsAlarmActionStepList, form, ids, loading, multiple, open, queryParams, recordAlarmRuleList, rules, showSearch, single, title, total } = toRefs(state);
+
+const resolveRuleName = (ruleObjId?: string | number) =>
+  recordAlarmRuleList.value.find((item) => item.objId === ruleObjId)?.ruleName || (ruleObjId ? String(ruleObjId) : '-');
 
 const getList = () => {
   loading.value = true;
   listEmsAlarmActionStep(queryParams.value).then((response) => {
-    emsAlarmActionStepList.value = response.rows;
-    total.value = response.total;
+    emsAlarmActionStepList.value = response.rows ?? [];
+    total.value = response.total ?? 0;
     loading.value = false;
   });
 };
 
-const getRecordAlarmRuleList = () => {
+const loadRuleOptions = () => {
   getEmsRecordAlarmRuleList().then((response) => {
-    recordAlarmRuleList.value = response.data;
+    recordAlarmRuleList.value = (response.data ?? response.rows ?? []) as EmsRecordAlarmRuleVO[];
   });
 };
 
@@ -218,17 +179,7 @@ const cancel = () => {
 };
 
 const reset = () => {
-  form.value = {
-    objId: null,
-    ruleObjId: null,
-    stepSequence: null,
-    description: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    remark: null
-  };
+  form.value = createFormData();
   formRef.value?.resetFields();
 };
 
@@ -256,36 +207,43 @@ const handleAdd = () => {
 
 const handleUpdate = (row) => {
   reset();
-  const objId = row.objId || ids.value;
+  const objId = row?.objId || ids.value[0];
+  if (!objId) {
+    return;
+  }
   getEmsAlarmActionStep(objId).then((response) => {
-    form.value = response.data;
+    form.value = {
+      ...createFormData(),
+      ...(response.data ?? {})
+    };
     open.value = true;
     title.value = '修改报警规则具体措施步骤';
   });
 };
 
 const submitForm = () => {
-  formRef.value.validate((valid) => {
-    if (valid) {
-      if (form.value.objId != null) {
-        updateEmsAlarmActionStep(form.value).then((response) => {
-          proxy?.$modal.msgSuccess('修改成功');
-          open.value = false;
-          getList();
-        });
-      } else {
-        addEmsAlarmActionStep(form.value).then((response) => {
-          proxy?.$modal.msgSuccess('新增成功');
-          open.value = false;
-          getList();
-        });
-      }
+  formRef.value?.validate((valid) => {
+    if (!valid) {
+      return;
     }
+    if (form.value.objId != null) {
+      updateEmsAlarmActionStep(form.value).then(() => {
+        proxy?.$modal.msgSuccess('修改成功');
+        open.value = false;
+        getList();
+      });
+      return;
+    }
+    addEmsAlarmActionStep(form.value).then(() => {
+      proxy?.$modal.msgSuccess('新增成功');
+      open.value = false;
+      getList();
+    });
   });
 };
 
 const handleDelete = (row) => {
-  const objIds = row.objId || ids.value;
+  const objIds = row?.objId || ids.value;
   proxy?.$modal
     .confirm('是否确认删除报警规则具体措施步骤编号为"' + objIds + '"的数据项？')
     .then(function () {
@@ -310,6 +268,6 @@ const handleExport = () => {
 
 onMounted(() => {
   getList();
-  getRecordAlarmRuleList();
+  loadRuleOptions();
 });
 </script>
diff --git a/src/views/ems/record/recordAlarmData/index.vue b/src/views/ems/record/recordAlarmData/index.vue
index 9de942d..f9c9a0c 100644
--- a/src/views/ems/record/recordAlarmData/index.vue
+++ b/src/views/ems/record/recordAlarmData/index.vue
@@ -1,215 +1,349 @@
 <template>
-  <div class="app-container">
-    <el-form ref="queryFormRef" :model="queryParams" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="计量设备名称" prop="monitorName">
-        <el-input v-model="queryParams.monitorName" placeholder="请输入计量设备名称" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
-      <!--      <el-form-item label="采集设备编号" prop="collectDeviceId">-->
-      <!--        <el-input-->
-      <!--          v-model="queryParams.collectDeviceId"-->
-      <!--          placeholder="请输入采集设备编号"-->
-      <!--          clearable-->
-      <!--          @keyup.enter="handleQuery"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
-      <el-form-item label="记录时间" prop="collectTime">
-        <el-date-picker clearable v-model="queryParams.collectTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择记录时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="异常类型" prop="alarmType">
-        <el-select v-model="queryParams.alarmType" placeholder="请选择异常类型" clearable>
-          <el-option v-for="dict in dict.type.alarm_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="异常状态" prop="alarmStatus">
-        <el-select v-model="queryParams.alarmStatus" placeholder="请选择异常状态" clearable>
-          <el-option v-for="dict in dict.type.alarm_status" :key="dict.value" :label="dict.label" :value="dict.value" />
-        </el-select>
-      </el-form-item>
-      <!--      <el-form-item label="操作时间" prop="operationTime">-->
-      <!--        <el-date-picker clearable-->
-      <!--                        v-model="queryParams.operationTime"-->
-      <!--                        type="date"-->
-      <!--                        value-format="yyyy-MM-dd"-->
-      <!--                        placeholder="请选择操作时间"-->
-      <!--        >-->
-      <!--        </el-date-picker>-->
-      <!--      </el-form-item>-->
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+  <div class="p-2">
+    <el-card shadow="never" class="hero-card">
+      <div class="hero-grid">
+        <div class="hero-main">
+          <div class="hero-kicker">ALARM CENTER</div>
+          <div class="hero-title">报警中心工作台</div>
+          <div class="hero-desc">把告警主记录、推送状态、确认处理动作收敛到一个入口里，减少在记录页、日志页、通知页之间来回切换。</div>
+          <div class="hero-tags">
+            <el-tag effect="dark" round class="hero-tag">实时告警闭环</el-tag>
+            <el-tag effect="plain" round class="hero-tag">{{ currentAlarmStatusLabel }}</el-tag>
+            <el-tag effect="plain" round class="hero-tag">{{ currentPushStatusLabel }}</el-tag>
+          </div>
+        </div>
+        <div class="hero-side">
+          <div class="hero-panel">
+            <div class="hero-panel-label">当前详情对象</div>
+            <div class="hero-panel-value">{{ selectedAlarm ? resolveMonitorName(selectedAlarm) : '未选中告警' }}</div>
+            <div class="hero-panel-foot">支持在左侧记录列表点选后联动查看推送日志与确认备注。</div>
+          </div>
+        </div>
+      </div>
+    </el-card>
 
-    <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="primary"-->
-      <!--          plain-->
-      <!--          icon="el-icon-plus"-->
-      <!--          size="mini"-->
-      <!--          @click="handleAdd"-->
-      <!--          v-hasPermi="['ems/record:recordAlarmData:add']"-->
-      <!--        >新增-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="success"-->
-      <!--          plain-->
-      <!--          icon="el-icon-edit"-->
-      <!--          size="mini"-->
-      <!--          :disabled="single"-->
-      <!--          @click="handleUpdate"-->
-      <!--          v-hasPermi="['ems/record:recordAlarmData:edit']"-->
-      <!--        >修改-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="danger"-->
-      <!--          plain-->
-      <!--          icon="el-icon-delete"-->
-      <!--          size="mini"-->
-      <!--          :disabled="multiple"-->
-      <!--          @click="handleDelete"-->
-      <!--          v-hasPermi="['ems/record:recordAlarmData:remove']"-->
-      <!--        >删除-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['ems/record:recordAlarmData:export']"
-          >导出
-        </el-button>
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover" class="query-card">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="点位名称" prop="monitorName">
+              <el-input v-model="queryParams.monitorName" placeholder="请输入点位名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="记录时间" prop="collectTime">
+              <el-date-picker clearable v-model="queryParams.collectTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择记录时间" />
+            </el-form-item>
+            <el-form-item label="异常类型" prop="alarmType">
+              <el-select v-model="queryParams.alarmType" placeholder="请选择异常类型" clearable style="width: 160px">
+                <el-option v-for="item in dict.type.alarm_type" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="异常状态" prop="alarmStatus">
+              <el-select v-model="queryParams.alarmStatus" placeholder="请选择异常状态" clearable style="width: 160px">
+                <el-option v-for="item in dict.type.alarm_status" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="告警标题" prop="alarmTitle">
+              <el-input v-model="queryParams.alarmTitle" placeholder="请输入告警标题" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="推送状态" prop="pushStatus">
+              <el-select v-model="queryParams.pushStatus" placeholder="请选择推送状态" clearable style="width: 160px">
+                <el-option v-for="item in pushStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <div class="summary-grid">
+      <el-card shadow="never" class="summary-card">
+        <div class="summary-label">匹配告警总数</div>
+        <div class="summary-value">{{ overviewSummary.totalCount ?? 0 }}</div>
+        <div class="summary-foot">{{ overviewLoading ? '正在按筛选条件汇总全量统计…' : '按当前筛选条件统计，不受分页结果影响' }}</div>
+      </el-card>
+      <el-card shadow="never" class="summary-card">
+        <div class="summary-label">待处理总数</div>
+        <div class="summary-value">{{ overviewSummary.unhandledCount ?? 0 }}</div>
+        <div class="summary-foot">用于快速判断当前筛选范围内仍待闭环的风险规模</div>
+      </el-card>
+      <el-card shadow="never" class="summary-card">
+        <div class="summary-label">推送失败总数</div>
+        <div class="summary-value">{{ overviewSummary.pushFailCount ?? 0 }}</div>
+        <div class="summary-foot">筛出当前条件下所有通知未送达的告警，便于统一追补</div>
+      </el-card>
+      <el-card shadow="never" class="summary-card">
+        <div class="summary-label">当前详情推送条数</div>
+        <div class="summary-value">{{ pushLogList.length }}</div>
+        <div class="summary-foot">点选左侧告警后右侧联动展示</div>
+      </el-card>
+    </div>
+
+    <el-row :gutter="12">
+      <el-col :xs="24" :lg="15">
+        <el-card shadow="never" class="table-card">
+          <template #header>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['ems/record:recordAlarmData:export']"
+                  >导出</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  icon="CircleCheck"
+                  :disabled="!selectedAlarm || selectedAlarm.alarmStatus === 0"
+                  @click="handleConfirmCurrentAlarm"
+                >
+                  确认处理
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="info" plain icon="Refresh" @click="refreshCurrentAlarm">刷新当前详情</el-button>
+              </el-col>
+              <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
+            </el-row>
+          </template>
+
+          <el-table
+            ref="tableRef"
+            v-loading="loading"
+            :data="recordAlarmDataList"
+            highlight-current-row
+            row-key="objId"
+            @selection-change="handleSelectionChange"
+            @row-click="handleRowClick"
+          >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="点位名称" align="center" min-width="180" show-overflow-tooltip>
+              <template #default="scope">
+                <div class="main-cell">{{ resolveMonitorName(scope.row) }}</div>
+                <div class="sub-cell">{{ scope.row.monitorId || scope.row.collectDeviceName || '-' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="记录时间" align="center" prop="collectTime" width="180">
+              <template #default="scope">
+                <span>{{ formatDateTime(scope.row.collectTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="异常类型" align="center" prop="alarmType" width="110">
+              <template #default="scope">
+                <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType" />
+              </template>
+            </el-table-column>
+            <el-table-column label="异常状态" align="center" prop="alarmStatus" width="110">
+              <template #default="scope">
+                <dict-tag :options="dict.type.alarm_status" :value="scope.row.alarmStatus" />
+              </template>
+            </el-table-column>
+            <el-table-column label="告警级别" align="center" prop="alarmLevel" width="100" />
+            <el-table-column label="推送状态" align="center" prop="pushStatus" width="110">
+              <template #default="scope">
+                <el-tag :type="getPushStatusMeta(scope.row.pushStatus).type" effect="light">
+                  {{ getPushStatusMeta(scope.row.pushStatus).label }}
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="告警标题" align="center" prop="alarmTitle" min-width="180" show-overflow-tooltip />
+            <el-table-column label="确认备注" align="center" prop="confirmRemark" min-width="180" show-overflow-tooltip />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+              <template #default="scope">
+                <el-button size="small" type="text" @click.stop="handleRowClick(scope.row)">查看</el-button>
+                <el-button
+                  size="small"
+                  type="text"
+                  icon="Edit"
+                  @click.stop="handleUpdate(scope.row)"
+                  v-hasPermi="['ems/record:recordAlarmData:edit']"
+                >
+                  修改
+                </el-button>
+                <el-button
+                  size="small"
+                  type="text"
+                  icon="Delete"
+                  @click.stop="handleDelete(scope.row)"
+                  v-hasPermi="['ems/record:recordAlarmData:remove']"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-card>
+      </el-col>
+
+      <el-col :xs="24" :lg="9">
+        <el-card shadow="never" class="detail-card" v-loading="detailLoading">
+          <template #header>
+            <div class="detail-header">
+              <span>告警中心详情</span>
+              <el-button link type="primary" :disabled="!selectedAlarm" @click="refreshCurrentAlarm">刷新</el-button>
+            </div>
+          </template>
+
+          <el-empty v-if="!selectedAlarm" description="请选择左侧一条告警记录查看详情" />
+
+          <template v-else>
+            <el-descriptions :column="1" border size="small" class="mb-3">
+              <el-descriptions-item label="告警标题">{{ selectedAlarm.alarmTitle || '-' }}</el-descriptions-item>
+              <el-descriptions-item label="点位名称">{{ resolveMonitorName(selectedAlarm) }}</el-descriptions-item>
+              <el-descriptions-item label="记录时间">{{ formatDateTime(selectedAlarm.collectTime) }}</el-descriptions-item>
+              <el-descriptions-item label="异常类型">
+                <dict-tag :options="dict.type.alarm_type" :value="selectedAlarm.alarmType" />
+              </el-descriptions-item>
+              <el-descriptions-item label="异常状态">
+                <dict-tag :options="dict.type.alarm_status" :value="selectedAlarm.alarmStatus" />
+              </el-descriptions-item>
+              <el-descriptions-item label="告警级别">{{ selectedAlarm.alarmLevel || '-' }}</el-descriptions-item>
+              <el-descriptions-item label="阈值/实际值">
+                {{ formatValue(selectedAlarm.thresholdValue) }} / {{ formatValue(selectedAlarm.actualValue) }}
+              </el-descriptions-item>
+              <el-descriptions-item label="推送状态">
+                <el-tag :type="getPushStatusMeta(selectedAlarm.pushStatus).type" effect="light">
+                  {{ getPushStatusMeta(selectedAlarm.pushStatus).label }}
+                </el-tag>
+              </el-descriptions-item>
+              <el-descriptions-item label="推送次数">{{ selectedAlarm.pushCount ?? 0 }}</el-descriptions-item>
+              <el-descriptions-item label="操作人员">{{ selectedAlarm.operationName || '-' }}</el-descriptions-item>
+              <el-descriptions-item label="确认备注">{{ selectedAlarm.confirmRemark || '-' }}</el-descriptions-item>
+              <el-descriptions-item label="恢复时间">{{ formatDateTime(selectedAlarm.recoverTime) }}</el-descriptions-item>
+              <el-descriptions-item label="异常内容">{{ selectedAlarm.alarmContent || '-' }}</el-descriptions-item>
+            </el-descriptions>
+
+            <div class="detail-actions">
+              <el-button type="primary" plain :disabled="selectedAlarm.alarmStatus === 0" @click="handleConfirmCurrentAlarm"
+                >确认并标记已处理</el-button
+              >
+              <el-button type="warning" plain @click="handleUpdate(selectedAlarm)">修正告警信息</el-button>
+            </div>
+
+            <div class="section-title">推送日志</div>
+            <div v-loading="pushLogLoading" class="push-log-wrap">
+              <el-scrollbar height="320px">
+                <el-empty v-if="!pushLogList.length && !pushLogLoading" description="暂无推送日志" />
+                <el-timeline v-else>
+                  <el-timeline-item
+                    v-for="item in pushLogList"
+                    :key="item.id"
+                    :timestamp="formatDateTime(item.pushTime)"
+                    :type="getPushStatusMeta(item.pushStatus).type"
+                    placement="top"
+                  >
+                    <el-card shadow="never" class="push-log-card">
+                      <div class="push-log-title">
+                        <span>{{ item.channelType || '未知渠道' }}</span>
+                        <el-tag :type="getPushStatusMeta(item.pushStatus).type" effect="light">
+                          {{ getPushStatusMeta(item.pushStatus).label }}
+                        </el-tag>
+                      </div>
+                      <div class="push-log-line">推送对象：{{ item.targetValue || '-' }}</div>
+                      <div class="push-log-line">告警级别：{{ item.alarmLevel || '-' }}</div>
+                      <div class="push-log-line">推送内容：{{ item.pushContent || '-' }}</div>
+                      <div class="push-log-line">响应信息：{{ item.responseMsg || '-' }}</div>
+                    </el-card>
+                  </el-timeline-item>
+                </el-timeline>
+              </el-scrollbar>
+            </div>
+          </template>
+        </el-card>
       </el-col>
-      <right-toolbar v-model:show-search="showSearch" @query-table="getList" :columns="columns"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordAlarmDataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible" />
-      <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[1].visible" />
-      <!-- <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible"/> -->
-      <el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="异常类型" align="center" prop="alarmType" v-if="columns[3].visible">
-        <template #default="scope">
-          <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[4].visible">
-        <template #default="scope">
-          <dict-tag :options="dict.type.alarm_status" :value="scope.row.alarmStatus" />
-        </template>
-      </el-table-column>
-      <el-table-column label="告警级别" align="center" prop="alarmLevel" v-if="columns[5].visible" />
-      <el-table-column label="阈值" align="center" prop="thresholdValue" v-if="columns[6].visible" />
-      <el-table-column label="实际值" align="center" prop="actualValue" v-if="columns[7].visible" />
-      <el-table-column label="告警标题" align="center" prop="alarmTitle" v-if="columns[8].visible" show-overflow-tooltip />
-      <el-table-column label="告警内容" align="center" prop="alarmContent" v-if="columns[9].visible" show-overflow-tooltip />
-      <el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[10].visible" />
-      <el-table-column label="操作人员" align="center" prop="operationName" v-if="columns[11].visible" />
-      <el-table-column label="操作时间" align="center" prop="operationTime" width="180" v-if="columns[12].visible">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="恢复时间" align="center" prop="recoverTime" width="180" v-if="columns[13].visible">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.recoverTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="确认备注" align="center" prop="confirmRemark" v-if="columns[14].visible" show-overflow-tooltip />
-      <el-table-column label="备注" align="center" prop="cause" v-if="columns[15].visible" />
-      <!-- <el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[14].visible"/> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
-        <template #default="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems/record:recordAlarmData:edit']"
-            >修改
-          </el-button>
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-delete"-->
-          <!--            @click="handleDelete(scope.row)"-->
-          <!--            v-hasPermi="['ems/record:recordAlarmData:remove']"-->
-          <!--          >删除-->
-          <!--          </el-button>-->
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-
-    <!-- 添加或修改异常数据记录对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="计量设备名称" prop="monitorName">
-          <el-input v-model="form.monitorName" placeholder="请输入计量设备名称" readonly />
-        </el-form-item>
-        <el-form-item label="采集设备名称" prop="collectDeviceName">
-          <el-input v-model="form.collectDeviceName" placeholder="请输入采集设备名称" readonly />
-        </el-form-item>
-        <el-form-item label="记录时间" prop="collectTime">
-          <el-date-picker clearable v-model="form.collectTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择记录时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="异常类型" prop="alarmType">
-          <el-radio-group v-model="form.alarmType">
-            <el-radio v-for="dict in dict.type.alarm_type" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="异常状态" prop="alarmStatus">
-          <el-radio-group v-model="form.alarmStatus">
-            <el-radio v-for="dict in dict.type.alarm_status" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label }} </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="告警级别" prop="alarmLevel">
-          <el-input v-model="form.alarmLevel" placeholder="请输入告警级别" />
-        </el-form-item>
-        <el-form-item label="阈值" prop="thresholdValue">
-          <el-input-number v-model="form.thresholdValue" placeholder="请输入阈值" :precision="4" />
-        </el-form-item>
-        <el-form-item label="实际值" prop="actualValue">
-          <el-input-number v-model="form.actualValue" placeholder="请输入实际值" :precision="4" />
-        </el-form-item>
+    <el-dialog :title="title" v-model="open" width="760px" append-to-body>
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="110px">
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="点位名称" prop="monitorName">
+              <el-input v-model="form.monitorName" placeholder="请输入点位名称" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采集设备名称" prop="collectDeviceName">
+              <el-input v-model="form.collectDeviceName" placeholder="请输入采集设备名称" readonly />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="记录时间" prop="collectTime">
+              <el-date-picker clearable v-model="form.collectTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择记录时间" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="异常类型" prop="alarmType">
+              <el-radio-group v-model="form.alarmType">
+                <el-radio v-for="item in dict.type.alarm_type" :key="item.value" :label="Number(item.value)">{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="异常状态" prop="alarmStatus">
+              <el-radio-group v-model="form.alarmStatus">
+                <el-radio v-for="item in dict.type.alarm_status" :key="item.value" :label="Number(item.value)">{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="告警级别" prop="alarmLevel">
+              <el-input v-model="form.alarmLevel" placeholder="请输入告警级别" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="阈值" prop="thresholdValue">
+              <el-input-number v-model="form.thresholdValue" placeholder="请输入阈值" :precision="4" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="实际值" prop="actualValue">
+              <el-input-number v-model="form.actualValue" placeholder="请输入实际值" :precision="4" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="告警标题" prop="alarmTitle">
           <el-input v-model="form.alarmTitle" placeholder="请输入告警标题" />
         </el-form-item>
         <el-form-item label="告警内容" prop="alarmContent">
-          <el-input v-model="form.alarmContent" type="textarea" placeholder="请输入告警内容" />
+          <el-input v-model="form.alarmContent" type="textarea" placeholder="请输入告警内容" :rows="3" />
         </el-form-item>
         <el-form-item label="异常数据" prop="alarmData">
           <el-input v-model="form.alarmData" placeholder="请输入异常数据" />
         </el-form-item>
-        <el-form-item label="恢复时间" prop="recoverTime">
-          <el-date-picker clearable v-model="form.recoverTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择恢复时间">
-          </el-date-picker>
-        </el-form-item>
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="恢复时间" prop="recoverTime">
+              <el-date-picker clearable v-model="form.recoverTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择恢复时间" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="推送状态" prop="pushStatus">
+              <el-select v-model="form.pushStatus" placeholder="请选择推送状态" clearable style="width: 100%">
+                <el-option v-for="item in pushStatusOptions" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-form-item label="确认备注" prop="confirmRemark">
-          <el-input v-model="form.confirmRemark" type="textarea" placeholder="请输入确认备注" />
+          <el-input v-model="form.confirmRemark" type="textarea" placeholder="请输入确认备注" :rows="3" />
         </el-form-item>
-        <!--        <el-form-item label="操作人员" prop="operationName">-->
-        <!--          <el-input v-model="form.operationName" placeholder="请输入操作人员"/>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="操作时间" prop="operationTime">-->
-        <!--          <el-date-picker clearable-->
-        <!--                          v-model="form.operationTime"-->
-        <!--                          type="date"-->
-        <!--                          value-format="yyyy-MM-dd"-->
-        <!--                          placeholder="请选择操作时间"-->
-        <!--          >-->
-        <!--          </el-date-picker>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="备注" prop="cause">-->
-        <!--          <el-input v-model="form.cause" placeholder="请输入备注"/>-->
-        <!--        </el-form-item>-->
-        <!--        <el-form-item label="通知用户" prop="notifyUser">-->
-        <!--          <el-input v-model="form.notifyUser" placeholder="请输入通知用户"/>-->
-        <!--        </el-form-item>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -222,29 +356,52 @@
 </template>
 
 <script setup lang="ts">
+import { getCurrentInstance } from 'vue';
 import { useDict } from '@/utils/dict';
 import { parseTime } from '@/utils/ruoyi';
 import {
   addRecordAlarmData,
   delRecordAlarmData,
+  getRecordAlarmDataSummary,
   getRecordAlarmData,
+  handleExceptions,
   listRecordAlarmData,
   updateRecordAlarmData
 } from '@/api/ems/record/recordAlarmData';
+import { listAlarmPushLog } from '@/api/ems/base/alarmPushLog';
+import type { AlarmPushLogVO } from '@/api/ems/base/alarmPushLog/types';
+import type { AlarmOverviewSummaryVO, EmsRecordAlarmDataVO } from '@/api/ems/types';
 
 defineOptions({
   name: 'RecordAlarmData',
   dicts: ['alarm_status', 'alarm_type']
 } as any);
 
-const { proxy } = getCurrentInstance() as any;
-
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const dict = reactive({
   type: useDict('alarm_status', 'alarm_type') as any
 });
 
-const queryFormRef = ref<any>();
-const formRef = ref<any>();
+const tableRef = ref();
+const queryFormRef = ref<ElFormInstance>();
+const formRef = ref<ElFormInstance>();
+const detailRequestToken = ref(0);
+
+const pushStatusOptions = [
+  { label: '待推送', value: 'PENDING', type: 'info' },
+  { label: '推送中', value: 'PROCESSING', type: 'warning' },
+  { label: '推送成功', value: 'SUCCESS', type: 'success' },
+  { label: '推送失败', value: 'FAIL', type: 'danger' }
+];
+
+const pushStatusMetaMap: Record<string, { label: string; type: 'info' | 'success' | 'warning' | 'danger' }> = {
+  PENDING: { label: '待推送', type: 'info' },
+  WAIT: { label: '待推送', type: 'info' },
+  PROCESSING: { label: '推送中', type: 'warning' },
+  SUCCESS: { label: '推送成功', type: 'success' },
+  FAIL: { label: '推送失败', type: 'danger' },
+  FAILED: { label: '推送失败', type: 'danger' }
+};
 
 const createQueryParams = () => ({
   pageNum: 1,
@@ -307,58 +464,190 @@ const createFormData = () => ({
   notifyUser: null
 });
 
+const createOverviewSummary = (): AlarmOverviewSummaryVO => ({
+  totalCount: 0,
+  unhandledCount: 0,
+  handledCount: 0,
+  pushPendingCount: 0,
+  pushProcessingCount: 0,
+  pushSuccessCount: 0,
+  pushFailCount: 0
+});
+
 const state = reactive({
   loading: true,
+  overviewLoading: false,
+  detailLoading: false,
+  pushLogLoading: false,
   ids: [] as Array<number | string>,
   single: true,
   multiple: true,
   showSearch: true,
   total: 0,
-  recordAlarmDataList: [] as any[],
+  recordAlarmDataList: [] as EmsRecordAlarmDataVO[],
+  overviewSummary: createOverviewSummary() as AlarmOverviewSummaryVO,
+  pushLogList: [] as AlarmPushLogVO[],
+  selectedAlarm: null as EmsRecordAlarmDataVO | null,
   title: '',
   open: false,
-  // 技术字段保留在查询对象里，便于导出和后端扩展过滤，但页面上不直接渲染这些字段。
   queryParams: createQueryParams() as any,
   form: createFormData() as any,
   rules: {
     objId: [{ required: true, message: '自增标识不能为空', trigger: 'blur' }]
-  } as any,
-  columns: [
-    { key: 0, label: '自增标识', visible: false },
-    { key: 1, label: '计量设备名称', visible: true },
-    { key: 2, label: '记录时间', visible: true },
-    { key: 3, label: '异常类型', visible: true },
-    { key: 4, label: '异常状态', visible: true },
-    { key: 5, label: '告警级别', visible: true },
-    { key: 6, label: '阈值', visible: true },
-    { key: 7, label: '实际值', visible: true },
-    { key: 8, label: '告警标题', visible: true },
-    { key: 9, label: '告警内容', visible: true },
-    { key: 10, label: '异常数据', visible: true },
-    { key: 11, label: '操作人员', visible: true },
-    { key: 12, label: '操作时间', visible: true },
-    { key: 13, label: '恢复时间', visible: true },
-    { key: 14, label: '确认备注', visible: true },
-    { key: 15, label: '备注', visible: false },
-    { key: 16, label: '创建人', visible: false },
-    { key: 17, label: '创建时间', visible: true },
-    { key: 18, label: '更新人', visible: false },
-    { key: 19, label: '更新时间', visible: false }
-  ] as any[]
+  } as any
 });
 
-const { loading, ids, single, multiple, showSearch, total, recordAlarmDataList, title, open, queryParams, form, rules, columns } = toRefs(state);
+const {
+  loading,
+  overviewLoading,
+  detailLoading,
+  pushLogLoading,
+  ids,
+  single,
+  multiple,
+  showSearch,
+  total,
+  recordAlarmDataList,
+  overviewSummary,
+  pushLogList,
+  selectedAlarm,
+  title,
+  open,
+  queryParams,
+  form,
+  rules
+} = toRefs(state);
+
+const currentAlarmStatusLabel = computed(() => {
+  if (!selectedAlarm.value) {
+    return '未选中告警';
+  }
+  const matched = (dict.type.alarm_status ?? []).find((item) => String(item.value) === String(selectedAlarm.value?.alarmStatus));
+  return matched?.label || '状态未知';
+});
+
+const currentPushStatusLabel = computed(() => {
+  if (!selectedAlarm.value) {
+    return '未选中推送状态';
+  }
+  return getPushStatusMeta(selectedAlarm.value.pushStatus).label;
+});
+
+const formatDateTime = (value?: string | Date | number | null) => {
+  if (!value) {
+    return '-';
+  }
+  return parseTime(value, '{y}-{m}-{d} {h}:{i}:{s}');
+};
+
+const formatValue = (value?: string | number | null) => {
+  if (value === null || value === undefined || value === '') {
+    return '-';
+  }
+  return value;
+};
+
+const getPushStatusMeta = (status?: string | null) => pushStatusMetaMap[String(status ?? '')] ?? { label: status || '未知', type: 'info' };
+
+const resolveMonitorName = (row?: EmsRecordAlarmDataVO | null) =>
+  row?.monitorName || row?.deviceName || row?.collectDeviceName || row?.monitorId || '-';
+
+const loadDetailAndPushLogs = async (row: EmsRecordAlarmDataVO) => {
+  if (!row?.objId) {
+    return;
+  }
+
+  const requestToken = ++detailRequestToken.value;
+  // 先把当前选中行同步到右侧，避免旧请求还没结束时详情面板停留在上一条记录。
+  selectedAlarm.value = { ...row } as EmsRecordAlarmDataVO;
+  pushLogList.value = [];
+  detailLoading.value = true;
+  pushLogLoading.value = true;
+  try {
+    const [detailRes, pushRes] = await Promise.allSettled([
+      // 先查主记录，是为了让右侧详情优先对齐最新业务字段。
+      getRecordAlarmData(row.objId),
+      // 推送日志独立查询，失败时也不能影响主列表和详情骨架展示。
+      listAlarmPushLog({
+        alarmObjId: row.objId,
+        pageNum: 1,
+        pageSize: 20
+      } as any)
+    ]);
+
+    if (requestToken !== detailRequestToken.value) {
+      return;
+    }
+
+    if (detailRes.status === 'fulfilled') {
+      selectedAlarm.value = {
+        ...row,
+        ...((detailRes.value as any).data ?? {})
+      } as EmsRecordAlarmDataVO;
+    }
+
+    if (pushRes.status === 'fulfilled') {
+      pushLogList.value = (((pushRes.value as any).rows ?? (pushRes.value as any).data ?? []) as AlarmPushLogVO[]) || [];
+    }
+  } finally {
+    if (requestToken === detailRequestToken.value) {
+      detailLoading.value = false;
+      pushLogLoading.value = false;
+    }
+  }
+};
+
+const syncCurrentRow = () => {
+  if (!recordAlarmDataList.value.length) {
+    detailRequestToken.value++;
+    selectedAlarm.value = null;
+    pushLogList.value = [];
+    return;
+  }
+
+  const selectedId = selectedAlarm.value?.objId;
+  const targetRow = (selectedId ? recordAlarmDataList.value.find((item) => item.objId === selectedId) : undefined) ?? recordAlarmDataList.value[0];
+  if (tableRef.value?.setCurrentRow) {
+    tableRef.value.setCurrentRow(targetRow);
+  }
+  void loadDetailAndPushLogs(targetRow as EmsRecordAlarmDataVO);
+};
 
 const getList = async () => {
   loading.value = true;
-  const response = await listRecordAlarmData(queryParams.value);
-  recordAlarmDataList.value = response.rows ?? response.data ?? [];
-  total.value = response.total ?? 0;
-  loading.value = false;
+  overviewLoading.value = true;
+  try {
+    const [listResult, summaryResult] = await Promise.allSettled([
+      listRecordAlarmData(queryParams.value),
+      getRecordAlarmDataSummary(queryParams.value)
+    ]);
+
+    if (listResult.status !== 'fulfilled') {
+      throw listResult.reason;
+    }
+
+    const response = listResult.value;
+    recordAlarmDataList.value = ((response as any).rows ?? (response as any).data ?? []) as EmsRecordAlarmDataVO[];
+    total.value = (response as any).total ?? recordAlarmDataList.value.length ?? 0;
+
+    if (summaryResult.status === 'fulfilled') {
+      overviewSummary.value = {
+        ...createOverviewSummary(),
+        ...(((summaryResult.value as any).data ?? {}) as AlarmOverviewSummaryVO)
+      };
+    } else {
+      overviewSummary.value = createOverviewSummary();
+    }
+
+    syncCurrentRow();
+  } finally {
+    loading.value = false;
+    overviewLoading.value = false;
+  }
 };
 
 const reset = () => {
-  // 这里显式重建表单对象，避免沿用旧引用导致弹窗残留上次编辑值。
+  // 这里显式重建表单对象，避免弹窗复用时残留上一次的确认信息。
   form.value = createFormData();
   formRef.value?.resetFields();
 };
@@ -378,26 +667,48 @@ const resetQuery = () => {
   handleQuery();
 };
 
-const handleSelectionChange = (selection: any[]) => {
-  ids.value = selection.map((item) => item.objId);
+const handleSelectionChange = (selection: EmsRecordAlarmDataVO[]) => {
+  ids.value = selection.map((item) => item.objId as string | number);
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
 
-const handleAdd = () => {
-  reset();
-  open.value = true;
-  title.value = '添加异常数据记录';
+const handleRowClick = async (row: EmsRecordAlarmDataVO) => {
+  tableRef.value?.setCurrentRow?.(row);
+  await loadDetailAndPushLogs(row);
 };
 
-const handleUpdate = async (row?: any) => {
+const refreshCurrentAlarm = async () => {
+  if (!selectedAlarm.value?.objId) {
+    return;
+  }
+  const matched = recordAlarmDataList.value.find((item) => item.objId === selectedAlarm.value?.objId);
+  if (matched) {
+    await loadDetailAndPushLogs(matched);
+  }
+};
+
+const handleConfirmCurrentAlarm = async () => {
+  if (!selectedAlarm.value?.objId) {
+    return;
+  }
+  await proxy?.$modal.confirm(`是否确认将告警“${selectedAlarm.value.alarmTitle || resolveMonitorName(selectedAlarm.value)}”标记为已处理？`);
+  await handleExceptions(selectedAlarm.value.objId as any);
+  proxy?.$modal.msgSuccess('确认处理成功');
+  await getList();
+};
+
+const handleUpdate = async (row?: EmsRecordAlarmDataVO) => {
   reset();
-  const objId = row?.objId || ids.value;
-  const response = await getRecordAlarmData(objId);
-  // 详情回填时合并默认对象，避免后端后续补字段后旧页面把隐藏字段重新置丢。
+  const objId = row?.objId || ids.value[0];
+  if (!objId) {
+    return;
+  }
+  const response = await getRecordAlarmData(objId as any);
+  // 这里合并默认对象，是为了避免以后后端新增字段时，旧表单把未展示字段清空。
   form.value = {
     ...createFormData(),
-    ...(response.data ?? {})
+    ...((response as any).data ?? {})
   };
   open.value = true;
   title.value = '修改异常数据记录';
@@ -419,10 +730,10 @@ const submitForm = async () => {
   await getList();
 };
 
-const handleDelete = async (row?: any) => {
+const handleDelete = async (row?: EmsRecordAlarmDataVO) => {
   const objIds = row?.objId || ids.value;
   await proxy?.$modal.confirm(`是否确认删除异常数据记录编号为"${objIds}"的数据项？`);
-  await delRecordAlarmData(objIds);
+  await delRecordAlarmData(objIds as any);
   await getList();
   proxy?.$modal.msgSuccess('删除成功');
 };
@@ -441,3 +752,190 @@ onMounted(() => {
   getList();
 });
 </script>
+
+<style scoped>
+.hero-card {
+  background:
+    linear-gradient(135deg, rgba(93, 25, 31, 0.97), rgba(140, 47, 32, 0.92)), linear-gradient(45deg, rgba(255, 191, 126, 0.16), transparent 42%);
+  border: none;
+  border-radius: 22px;
+  color: #fff4ea;
+  margin-bottom: 12px;
+  overflow: hidden;
+}
+
+.hero-grid {
+  display: grid;
+  grid-template-columns: minmax(0, 2fr) minmax(280px, 0.95fr);
+  gap: 18px;
+}
+
+.hero-kicker {
+  color: rgba(255, 230, 214, 0.76);
+  font-size: 12px;
+  letter-spacing: 0.22em;
+  margin-bottom: 10px;
+}
+
+.hero-title {
+  font-size: 30px;
+  font-weight: 700;
+  line-height: 1.15;
+}
+
+.hero-desc {
+  color: rgba(255, 236, 223, 0.88);
+  font-size: 14px;
+  line-height: 1.8;
+  margin-top: 12px;
+}
+
+.hero-tags {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  margin-top: 18px;
+}
+
+.hero-tag {
+  border-radius: 999px;
+}
+
+.hero-side {
+  display: flex;
+  align-items: stretch;
+}
+
+.hero-panel {
+  width: 100%;
+  background: linear-gradient(180deg, rgba(255, 245, 237, 0.14), rgba(255, 245, 237, 0.06));
+  border: 1px solid rgba(255, 226, 207, 0.16);
+  border-radius: 18px;
+  padding: 20px 22px;
+}
+
+.hero-panel-label {
+  color: rgba(255, 229, 212, 0.72);
+  font-size: 12px;
+  letter-spacing: 0.14em;
+  text-transform: uppercase;
+}
+
+.hero-panel-value {
+  font-size: 22px;
+  font-weight: 600;
+  line-height: 1.4;
+  margin-top: 12px;
+}
+
+.hero-panel-foot {
+  color: rgba(255, 232, 218, 0.8);
+  font-size: 13px;
+  line-height: 1.7;
+  margin-top: 10px;
+}
+
+.summary-grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 12px;
+  margin-bottom: 12px;
+}
+
+.summary-card {
+  border-radius: 18px;
+  border: 1px solid rgba(173, 88, 55, 0.1);
+  box-shadow: 0 14px 28px rgba(84, 30, 25, 0.05);
+}
+
+.summary-label {
+  color: #86695c;
+  font-size: 13px;
+  margin-bottom: 8px;
+}
+
+.summary-value {
+  color: #6c2725;
+  font-size: 28px;
+  font-weight: 700;
+  line-height: 1.1;
+}
+
+.summary-foot {
+  color: #9d8a82;
+  font-size: 12px;
+  margin-top: 10px;
+}
+
+.main-cell {
+  line-height: 20px;
+  font-weight: 600;
+}
+
+.sub-cell {
+  color: var(--el-text-color-secondary);
+  font-size: 12px;
+  line-height: 18px;
+}
+
+.detail-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-weight: 600;
+}
+
+.section-title {
+  margin: 8px 0 12px;
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.push-log-card {
+  margin-bottom: 8px;
+}
+
+.push-log-wrap {
+  min-height: 120px;
+}
+
+.detail-actions {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 16px;
+}
+
+.push-log-title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  margin-bottom: 6px;
+  font-weight: 600;
+}
+
+.push-log-line {
+  margin-top: 4px;
+  color: var(--el-text-color-secondary);
+  line-height: 20px;
+}
+
+@media (max-width: 1200px) {
+  .hero-grid,
+  .summary-grid {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+@media (max-width: 768px) {
+  .hero-grid,
+  .summary-grid {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+  }
+
+  .detail-actions {
+    flex-direction: column;
+  }
+}
+</style>
diff --git a/src/views/ems/record/recordAlarmRule/index.vue b/src/views/ems/record/recordAlarmRule/index.vue
index 7baa042..6de95ea 100644
--- a/src/views/ems/record/recordAlarmRule/index.vue
+++ b/src/views/ems/record/recordAlarmRule/index.vue
@@ -68,39 +68,32 @@
 
     <el-table v-loading="loading" :data="recordAlarmRuleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible" />
-      <el-table-column label="规则编号" align="center" prop="ruleId" v-if="columns[1].visible" />
-      <el-table-column label="规则名称" align="center" prop="ruleName" v-if="columns[2].visible" />
-      <el-table-column label="计量设备" align="center" prop="monitorName" v-if="columns[3].visible" />
-      <el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[4].visible">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="能源类型" align="center" prop="energyType" v-if="columns[5].visible" />
-      <el-table-column label="触发规则" align="center" prop="triggerRule" v-if="columns[6].visible">
+      <el-table-column label="序号" type="index" width="60" align="center" v-if="columns[0].visible" />
+      <el-table-column label="规则名称" align="center" prop="ruleName" v-if="columns[1].visible" />
+      <el-table-column label="计量设备" align="center" prop="monitorName" v-if="columns[2].visible" />
+      <el-table-column label="触发规则" align="center" prop="triggerRule" v-if="columns[3].visible">
         <template #default="scope">
           <dict-tag :options="dict.type.trigger_rule" :value="scope.row.triggerRule" />
         </template>
       </el-table-column>
-      <el-table-column label="监测字段" align="center" prop="monitorField" v-if="columns[7].visible">
+      <el-table-column label="监测字段" align="center" prop="monitorField" v-if="columns[4].visible">
         <template #default="scope">
           <dict-tag :options="dict.type.monitor_field" :value="scope.row.monitorField" />
         </template>
       </el-table-column>
-      <el-table-column label="告警上限" align="center" prop="alarmUpper" v-if="columns[8].visible" />
-      <el-table-column label="告警下限" align="center" prop="alarmLower" v-if="columns[9].visible" />
-      <el-table-column label="恢复上限" align="center" prop="recoverUpper" v-if="columns[10].visible" />
-      <el-table-column label="恢复下限" align="center" prop="recoverLower" v-if="columns[11].visible" />
-      <el-table-column label="回差" align="center" prop="hysteresis" v-if="columns[12].visible" />
-      <el-table-column label="持续秒数" align="center" prop="durationSec" v-if="columns[13].visible" />
-      <el-table-column label="告警级别" align="center" prop="alarmLevel" v-if="columns[14].visible" />
-      <el-table-column label="启用状态" align="center" prop="isEnable" v-if="columns[15].visible">
+      <el-table-column label="告警上限" align="center" prop="alarmUpper" v-if="columns[5].visible" />
+      <el-table-column label="告警下限" align="center" prop="alarmLower" v-if="columns[6].visible" />
+      <el-table-column label="恢复上限" align="center" prop="recoverUpper" v-if="columns[7].visible" />
+      <el-table-column label="恢复下限" align="center" prop="recoverLower" v-if="columns[8].visible" />
+      <el-table-column label="回差" align="center" prop="hysteresis" v-if="columns[9].visible" />
+      <el-table-column label="持续秒数" align="center" prop="durationSec" v-if="columns[10].visible" />
+      <el-table-column label="告警级别" align="center" prop="alarmLevel" v-if="columns[11].visible" />
+      <el-table-column label="启用状态" align="center" prop="isEnable" v-if="columns[12].visible">
         <template #default="scope">
           <dict-tag :options="dict.type.is_flag" :value="scope.row.isEnable" />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="cause" v-if="columns[16].visible" />
+      <el-table-column label="备注" align="center" prop="cause" v-if="columns[13].visible" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
         <template #default="scope">
           <el-button
@@ -437,86 +430,71 @@ const state = reactive({
   columns: [
     {
       key: 0,
-      label: `自增标识`,
-      visible: false
+      label: `序号`,
+      visible: true
     },
     {
       key: 1,
-      label: `规则编号`,
-      visible: false
-    },
-    {
-      key: 2,
       label: `规则名称`,
       visible: true
     },
     {
-      key: 3,
+      key: 2,
       label: `计量设备`,
       visible: true
     },
     {
-      key: 4,
-      label: `记录时间`,
-      visible: false
-    },
-    {
-      key: 5,
-      label: `能源类型`,
-      visible: false
-    },
-    {
-      key: 6,
+      key: 3,
       label: `触发规则`,
       visible: true
     },
     {
-      key: 7,
+      key: 4,
       label: `监测字段`,
       visible: true
     },
     {
-      key: 8,
+      key: 5,
       label: `告警上限`,
       visible: true
     },
     {
-      key: 9,
+      key: 6,
       label: `告警下限`,
       visible: true
     },
     {
-      key: 10,
+      key: 7,
       label: `恢复上限`,
       visible: true
     },
     {
-      key: 11,
+      key: 8,
       label: `恢复下限`,
       visible: true
     },
     {
-      key: 12,
+      key: 9,
       label: `回差`,
       visible: true
     },
     {
-      key: 13,
+      key: 10,
       label: `持续秒数`,
       visible: true
     },
     {
-      key: 14,
+      key: 11,
       label: `告警级别`,
       visible: true
     },
     {
-      key: 15,
+      key: 12,
       label: `启用状态`,
       visible: true
     },
     {
-      key: 16,
+      key: 13,
       label: `备注`,
       visible: true
     }
diff --git a/src/views/ems/record/recordIotenvInstant/index.vue b/src/views/ems/record/recordIotenvInstant/index.vue
index 1b658ef..13411b2 100644
--- a/src/views/ems/record/recordIotenvInstant/index.vue
+++ b/src/views/ems/record/recordIotenvInstant/index.vue
@@ -189,7 +189,7 @@
           <el-table-column type="selection" width="55" align="center" />
           <!--                    <el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>-->
           <el-table-column label="序号" type="index" width="55" align="center" v-if="columns[0].visible" />
-          <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"> </el-table-column>
+          <el-table-column label="点位名称" align="center" prop="monitorName" v-if="columns[1].visible"> </el-table-column>
           <el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible"> </el-table-column>
           <el-table-column label="湿度" align="center" prop="humidity" v-if="columns[3].visible"> </el-table-column>
           <el-table-column label="照度" align="center" prop="illuminance" v-if="columns[4].visible"> </el-table-column>
@@ -230,35 +230,43 @@
     <!-- 添加或修改物联网数据对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="计量设备编号" prop="monitorId">
-          <el-input v-model="form.monitorId" placeholder="请输入计量设备编号" />
+        <el-form-item label="点位名称" prop="monitorId">
+          <el-tree-select
+            v-model="form.monitorId"
+            :data="monitorInfoOptions"
+            :props="monitorProps"
+            placeholder="请选择点位"
+            filterable
+            check-strictly
+            style="width: 100%"
+          />
         </el-form-item>
         <el-form-item label="温度" prop="temperature">
-          <el-input v-model="form.temperature" placeholder="请输入温度" />
+          <el-input-number v-model="form.temperature" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="湿度" prop="humidity">
-          <el-input v-model="form.humidity" placeholder="请输入湿度" />
+          <el-input-number v-model="form.humidity" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="照度" prop="illuminance">
-          <el-input v-model="form.illuminance" placeholder="请输入照度" />
+          <el-input-number v-model="form.illuminance" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="噪声" prop="noise">
-          <el-input v-model="form.noise" placeholder="请输入噪声" />
+          <el-input-number v-model="form.noise" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="硫化氢浓度" prop="concentration">
-          <el-input v-model="form.concentration" placeholder="请输入硫化氢浓度" />
+          <el-input-number v-model="form.concentration" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="振动-速度(mm/s)" prop="vibrationSpeed">
-          <el-input v-model="form.vibrationSpeed" placeholder="请输入振动-速度(mm/s)" />
+          <el-input-number v-model="form.vibrationSpeed" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="振动-位移(um)" prop="vibrationDisplacement">
-          <el-input v-model="form.vibrationDisplacement" placeholder="请输入振动-位移(um)" />
+          <el-input-number v-model="form.vibrationDisplacement" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="振动-加速度(g)" prop="vibrationAcceleration">
-          <el-input v-model="form.vibrationAcceleration" placeholder="请输入振动-加速度(g)" />
+          <el-input-number v-model="form.vibrationAcceleration" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="振动-温度(℃)" prop="vibrationTemp">
-          <el-input v-model="form.vibrationTemp" placeholder="请输入振动-温度(℃)" />
+          <el-input-number v-model="form.vibrationTemp" :precision="4" controls-position="right" style="width: 100%" />
         </el-form-item>
         <el-form-item label="采集时间" prop="collectTime">
           <el-date-picker clearable v-model="form.collectTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择采集时间"> </el-date-picker>
@@ -375,12 +383,12 @@ const state = reactive({
   columns: [
     {
       key: 0,
-      label: `标识`,
+      label: `序号`,
       visible: true
     },
     {
       key: 1,
-      label: `计量设备编号`,
+      label: `点位名称`,
       visible: true
     },
     {
@@ -597,7 +605,7 @@ const handleUpdate = (row) => {
 };
 
 const submitForm = () => {
-  form.value.validate((valid) => {
+  formRef.value?.validate((valid) => {
     if (valid) {
       if (form.value.objid != null) {
         updateRecordIotenvInstant(form.value).then((response) => {
diff --git a/src/views/ems/report/currentIOTCurve/copy.vue b/src/views/ems/report/currentIOTCurve/copy.vue
deleted file mode 100644
index cdfa2ea..0000000
--- a/src/views/ems/report/currentIOTCurve/copy.vue
+++ /dev/null
@@ -1,594 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="28">
-      <el-col :span="5" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="workUnitName"
-            placeholder="请输入物联网设备名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="monitorInfoOptions"
-            :props="monitorProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <el-col :span="19" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-          <!--          <el-form-item label="计量设备编号" prop="monitorCode">-->
-          <!--            <el-input-->
-          <!--              v-model="queryParams.monitorCode"-->
-          <!--              placeholder="请输入计量设备编号"-->
-          <!--              clearable-->
-          <!--              @keyup.enter="handleQuery"-->
-          <!--            />-->
-          <!--          </el-form-item>-->
-          <el-form-item label="记录时间">
-            <el-date-picker
-              v-model="daterangeRecordTime"
-              style="width: 340px"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              type="datetimerange"
-              range-separator="-"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <Chart ref="Chart1" class="chart1" />
-        <!-- <Chart ref="Chart2" class="chart2"/> -->
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useDict } from '@/utils/dict';
-import { listRecordIOTInstant, getRecordIOTInstant, iotInstantList } from '@/api/ems/record/recordIOTInstant';
-import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
-import { parseTime } from '@/utils/ruoyi';
-import Chart from '@/components/Charts/Chart';
-import * as echarts from 'echarts';
-
-defineOptions({
-  name: 'CurrentIOTCurve',
-  dicts: ['collect_type']
-} as any);
-
-const { proxy } = getCurrentInstance() as any;
-
-const dict = reactive({
-  type: useDict('collect_type') as any
-});
-
-const Chart1 = ref<any>();
-const Chart2 = ref<any>();
-const queryForm = ref<any>();
-const tree = ref<any>();
-
-// 这里统一通过工厂函数重建表单，避免弹窗在新增/编辑切换时残留上一条业务数据。
-const createFormData = () => ({
-  objId: null,
-  monitorId: null,
-  collectTime: null,
-  recordTime: null,
-  collectType: 1
-});
-
-// 这里保留原页面字段结构，优先保证 EMS 业务行为与接口入参不发生漂移。
-const state = reactive({
-  //下拉树List
-  baseMonitorInfoOptions: [],
-  //左侧树结构List
-  monitorInfoOptions: [],
-  workUnitName: undefined,
-  //左侧树结构 检索设备名称
-  selectMonitorName: null,
-  //计量设备信息
-  baseMonitorInfoList: [],
-  // 采集方式时间范围
-  daterangeRecordTime: [],
-  // 遮罩层
-  loading: true,
-  // 选中数组
-  ids: [],
-  // 非单个禁用
-  single: true,
-  // 非多个禁用
-  multiple: true,
-  // 显示搜索条件
-  showSearch: true,
-  // 总条数
-  total: 0,
-  // 电实时数据表格数据
-  dataList: [],
-  // 弹出层标题
-  title: '',
-  // 是否显示弹出层
-  open: false,
-  // 查询参数
-  queryParams: {
-    monitorId: null,
-    collectTime: null,
-    tempreture: null,
-    humidity: null,
-    illuminance: null,
-    noise: null,
-    concentration: null,
-    recordTime: null,
-    glys: null,
-    zxyg: null,
-    activePower: null,
-    reactivePower: null,
-    collectType: null
-  },
-  // 表单参数
-  form: createFormData(),
-  monitorProps: {
-    children: 'children',
-    label: 'label'
-  },
-  // 表单校验
-  rules: {
-    objId: [
-      {
-        required: true,
-        message: '编号不能为空',
-        trigger: 'blur'
-      }
-    ]
-  },
-  columns: [
-    {
-      key: 0,
-      label: `主键标识`,
-      visible: false
-    },
-    {
-      key: 1,
-      label: `计量设备编号`,
-      visible: true
-    },
-    {
-      key: 2,
-      label: `采集时间`,
-      visible: true
-    },
-    {
-      key: 3,
-      label: `温度`,
-      visible: true
-    },
-    {
-      key: 4,
-      label: `湿度`,
-      visible: true
-    },
-    {
-      key: 5,
-      label: `照度`,
-      visible: true
-    },
-    {
-      key: 6,
-      label: `噪声`,
-      visible: true
-    },
-    {
-      key: 7,
-      label: `硫化氢浓度`,
-      visible: true
-    },
-    {
-      key: 8,
-      label: `记录时间`,
-      visible: true
-    },
-    {
-      key: 9,
-      label: `报警类型`,
-      visible: true
-    },
-    {
-      key: 10,
-      label: ``,
-      visible: true
-    },
-    {
-      key: 11,
-      label: ``,
-      visible: false
-    },
-    {
-      key: 12,
-      label: ``,
-      visible: false
-    },
-    {
-      key: 13,
-      label: ``,
-      visible: true
-    },
-    {
-      key: 14,
-      label: ``,
-      visible: true
-    }
-  ]
-} as any);
-
-const {
-  baseMonitorInfoList,
-  baseMonitorInfoOptions,
-  columns,
-  dataList,
-  daterangeRecordTime,
-  form,
-  ids,
-  loading,
-  monitorInfoOptions,
-  monitorProps,
-  multiple,
-  open,
-  queryParams,
-  rules,
-  selectMonitorName,
-  showSearch,
-  single,
-  title,
-  total,
-  workUnitName
-} = toRefs(state);
-
-const normalizer = (node) => {
-  if (node.children && !node.children.length) {
-    delete node.children;
-  }
-  return {
-    id: node.monitorId,
-    label: node.monitorName,
-    children: node.children
-  };
-};
-
-const getList = () => {
-  loading.value = true;
-  queryParams.value.params = {};
-  if (null != daterangeRecordTime.value && '' != daterangeRecordTime.value) {
-    queryParams.value.params['beginRecordTime'] = daterangeRecordTime.value[0];
-    queryParams.value.params['endRecordTime'] = daterangeRecordTime.value[1];
-  }
-  console.log(monitorInfoOptions.value);
-  getChart();
-};
-
-const cancel = () => {
-  open.value = false;
-  reset();
-};
-
-const reset = () => {
-  form.value = {
-    objId: null,
-    monitorId: null,
-    collectTime: null,
-    recordTime: null,
-    collectType: 1
-  };
-  form.value?.resetFields();
-};
-
-const handleQuery = () => {
-  getList();
-};
-
-const resetQuery = () => {
-  queryParams.value.monitorId = null;
-  queryForm.value?.resetFields();
-  handleQuery();
-};
-
-const handleExport = () => {
-  proxy?.download(
-    'ems/record/recordIOTInstant/export',
-    {
-      ...queryParams.value
-    },
-    `recordIOTInstant_${new Date().getTime()}.xlsx`
-  );
-};
-
-const getTreeselect = () => {
-  getMonitorInfoTree({
-    monitorTypeList: [5, 6, 7, 8, 9]
-  }).then((response) => {
-    monitorInfoOptions.value = response.data;
-  });
-};
-
-const filterNode = (value, data) => {
-  if (!value) return true;
-  return data.label.indexOf(value) !== -1;
-};
-
-const handleNodeClick = (data, type, a) => {
-  console.log(type.parent.data);
-  console.log(a);
-  // queryParams.value.monitorTypeList = type
-  queryParams.value.monitorId = data.code;
-  selectMonitorName.value = data.label;
-  handleQuery();
-};
-
-const getChart = async () => {
-  if (queryParams.value.monitorId == null) {
-    return;
-  }
-  const query = JSON.parse(JSON.stringify(queryParams.value));
-  const { data } = await iotInstantList(query);
-  const option1 = {
-    title: {
-      text: '物联网设备曲线',
-      // selectMonitorName.value
-      x: 'center'
-    },
-    legend: {
-      data: data.monitorTypeArr,
-      right: 0
-    },
-    grid: {
-      top: '15%',
-      bottom: '10%',
-      left: '3%',
-      right: '3%'
-    },
-    tooltip: {
-      trigger: 'axis'
-      // axisPointer: {
-      //   type: 'shadow',
-      //   label: {
-      //     show: true
-      //   }
-      // }
-    },
-    dataZoom: [
-      {
-        type: 'slider'
-      }
-    ],
-    xAxis: {
-      data: data.dataList.map((e) => e.collectTime),
-      axisLine: {
-        show: true,
-        //隐藏X轴轴线
-        lineStyle: {
-          color: '#000'
-        }
-      },
-      // axisTick: {
-      //   show: true //隐藏X轴刻度
-      // },
-      axisLabel: {
-        show: true,
-        textStyle: {
-          color: '#000' //X轴文字颜色
-        }
-      }
-    },
-    yAxis: [
-      {
-        type: 'value',
-        name: '数值',
-        nameTextStyle: {
-          color: '#000'
-        },
-        splitLine: {
-          show: false
-        },
-        axisTick: {
-          show: true
-        },
-        axisLine: {
-          show: true,
-          lineStyle: {
-            color: '#000'
-          }
-        },
-        axisLabel: {
-          show: true,
-          textStyle: {
-            color: '#000'
-          }
-        }
-      }
-    ],
-    series: [
-      {
-        tooltip: {
-          show: data.monitorTypeArr.includes('温度') ? true : false
-        },
-        name: '温度',
-        type: data.type,
-        smooth: data.smooth,
-        //平滑曲线显示
-        showAllSymbol: data.showAllSymbol,
-        //显示所有图形。
-        symbol: data.symbol,
-        //标记的图形为实心圆
-        symbolSize: data.symbolSize,
-        //标记的大小
-        // itemStyle: {
-        //   //折线拐点标志的样式
-        //   color: "#058cff",
-        // },
-        // lineStyle: {
-        //   color: "#058cff",
-        // },
-        // areaStyle: {
-        //   color: "rgba(5,140,255, 0.2)",
-        // },
-        data: data.monitorTypeArr.includes('温度') ? data.dataList.map((e) => e.tempreture) : []
-      },
-      {
-        tooltip: {
-          show: data.monitorTypeArr.includes('湿度') ? true : false
-        },
-        name: '湿度',
-        type: data.type,
-        smooth: data.smooth,
-        //平滑曲线显示
-        showAllSymbol: data.showAllSymbol,
-        //显示所有图形。
-        symbol: data.symbol,
-        //标记的图形为实心圆
-        symbolSize: data.symbolSize,
-        //标记的大小
-        // itemStyle: {
-        //   //折线拐点标志的样式
-        //   color: "#058cff",
-        // },
-        // lineStyle: {
-        //   color: "#058cff",
-        // },
-        // areaStyle: {
-        //   color: "rgba(5,140,255, 0.2)",
-        // },
-        data: data.monitorTypeArr.includes('湿度') ? data.dataList.map((e) => e.humidity) : []
-      },
-      {
-        tooltip: {
-          show: data.monitorTypeArr.includes('噪声') ? true : false
-        },
-        name: '噪声',
-        type: data.type,
-        smooth: data.smooth,
-        //平滑曲线显示
-        showAllSymbol: data.showAllSymbol,
-        //显示所有图形。
-        symbol: data.symbol,
-        //标记的图形为实心圆
-        symbolSize: data.symbolSize,
-        //标记的大小
-        // itemStyle: {
-        //   //折线拐点标志的样式
-        //   color: "#058cff",
-        // },
-        // lineStyle: {
-        //   color: "#058cff",
-        // },
-        // areaStyle: {
-        //   color: "rgba(5,140,255, 0.2)",
-        // },
-        data: data.monitorTypeArr.includes('噪声') ? data.dataList.map((e) => e.noise) : []
-      },
-      {
-        tooltip: {
-          show: data.monitorTypeArr.includes('照度') ? true : false
-        },
-        name: '照度',
-        type: data.type,
-        smooth: data.smooth,
-        //平滑曲线显示
-        showAllSymbol: data.showAllSymbol,
-        //显示所有图形。
-        symbol: data.symbol,
-        //标记的图形为实心圆
-        symbolSize: data.symbolSize,
-        //标记的大小
-        // itemStyle: {
-        //   //折线拐点标志的样式
-        //   color: "#058cff",
-        // },
-        // lineStyle: {
-        //   color: "#058cff",
-        // },
-        // areaStyle: {
-        //   color: "rgba(5,140,255, 0.2)",
-        // },
-        data: data.monitorTypeArr.includes('照度') ? data.dataList.map((e) => e.illuminance) : []
-      },
-      {
-        tooltip: {
-          show: data.monitorTypeArr.includes('气体浓度') ? true : false
-        },
-        name: '气体浓度',
-        type: data.type,
-        smooth: data.smooth,
-        //平滑曲线显示
-        showAllSymbol: data.showAllSymbol,
-        //显示所有图形。
-        symbol: data.symbol,
-        //标记的图形为实心圆
-        symbolSize: data.symbolSize,
-        //标记的大小
-        // itemStyle: {
-        //   //折线拐点标志的样式
-        //   color: "#058cff",
-        // },
-        // lineStyle: {
-        //   color: "#058cff",
-        // },
-        // areaStyle: {
-        //   color: "rgba(5,140,255, 0.2)",
-        // },
-        data: data.monitorTypeArr.includes('气体浓度') ? data.dataList.map((e) => e.concentration) : []
-      }
-    ]
-  };
-  console.log(option1);
-  Chart1.value.setData(option1);
-  echarts.connect(Chart1.value.chart);
-  // , Chart2.value.chart
-  Chart1.value.chart.on('datazoom', (e) => {
-    option1.dataZoom[0].start = e.start;
-    option1.dataZoom[0].end = e.end;
-    Chart1.value.setData(option1);
-  });
-  // Chart2.value.chart.on('datazoom', (e) => {
-  //   option1.dataZoom[0].start = e.start
-  //   option1.dataZoom[0].end = e.end
-  //   Chart1.value.setData(option1)
-  // })
-};
-
-watch(workUnitName, (val) => {
-  tree.value.filter(val);
-});
-
-onMounted(() => {
-  const nowDate = parseTime(new Date(), '{y}-{m}-{d}');
-  daterangeRecordTime.value[0] = nowDate + ' 00:00:00';
-  daterangeRecordTime.value[1] = nowDate + ' 23:59:59';
-  getTreeselect();
-  getList();
-});
-</script>
-<style scoped>
-.chart1 {
-  width: 100%;
-  height: 75vh;
-}
-
-.chart2 {
-  width: 100%;
-  height: 40vh;
-}
-</style>
diff --git a/src/views/ems/report/currentIOTCurve/index.vue b/src/views/ems/report/currentIOTCurve/index.vue
index bdb8a6f..c157e78 100644
--- a/src/views/ems/report/currentIOTCurve/index.vue
+++ b/src/views/ems/report/currentIOTCurve/index.vue
@@ -85,7 +85,7 @@ import { ElMessage } from 'element-plus';
 import { useDict } from '@/utils/dict';
 import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
 import { parseTime } from '@/utils/ruoyi';
-import Chart from '@/components/Charts/Chart';
+import Chart from '@/components/Charts/Chart.vue';
 import * as echarts from 'echarts';
 import { getRecordIotenvInstantList } from '@/api/ems/record/recordIotenvInstant';
 
diff --git a/src/views/ems/report/recordIotenvInstantDashboard/index.vue b/src/views/ems/report/recordIotenvInstantDashboard/index.vue
index 26c355f..066be2f 100644
--- a/src/views/ems/report/recordIotenvInstantDashboard/index.vue
+++ b/src/views/ems/report/recordIotenvInstantDashboard/index.vue
@@ -241,7 +241,7 @@
 
 <script setup lang="ts">
 import { ElMessage } from 'element-plus';
-import Chart from '@/components/Charts/Chart';
+import Chart from '@/components/Charts/Chart.vue';
 import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo';
 import { getRecordIotenvInstantReportData } from '@/api/ems/record/recordIotenvInstant';