diff --git a/src/api/faultManage/actAlarm.ts b/src/api/faultManage/actAlarm.ts
index a2f5929c..a53fda48 100644
--- a/src/api/faultManage/actAlarm.ts
+++ b/src/api/faultManage/actAlarm.ts
@@ -1,36 +1,30 @@
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
 import { parseObjLineToHump } from '@/utils/parse-utils';
-import { parseDateToStr } from '@/utils/date-utils';
-import useUserStore from '@/store/modules/user';
 
 /**
  * 获取活动告警数
  * @returns object
  */
 export async function getActiveAlarmTotal() {
-  let totalSQL = `select count(*)  as total from alarm where alarm_status='1'`;
-
   // 发起请求
   const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm`,
+    url: `/neData/alarm/list`,
     method: 'GET',
     params: {
-      SQL: totalSQL,
+      alarmStatus: '1',
+      sortField: 'event_time',
+      sortOrder: 'desc',
+      pageNum: 1,
+      pageSize: 1,
     },
   });
 
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const itemData = result.data.data;
-    if (Array.isArray(itemData)) {
-      const v = itemData[0]['alarm'];
-      if (Array.isArray(v)) {
-        result.data = v[0]['total'];
-      }
-    }
-  }
-  return result;
+  return {
+    code: result.code,
+    msg: result.msg,
+    data: result.data.total ?? 0,
+  };
 }
 
 /**
@@ -38,77 +32,12 @@ export async function getActiveAlarmTotal() {
  * @param query 查询参数
  * @returns object
  */
-export async function listAct(query: Record<string, any>, filterSQl: string) {
-  let totalSQL = `select count(*)  as total from alarm where alarm_status='1' ${filterSQl} `;
-  let rowsSQL = `select * from alarm where alarm_status='1' ${filterSQl}`;
-  // 查询
-  let querySQL = '';
-  if (query.alarmCode) {
-    querySQL += ` and alarm_code = '${query.alarmCode}' `;
-  }
-
-  if (query.alarmType) {
-    querySQL += ` and alarm_type = '${query.alarmType}' `;
-  }
-
-  if (query.pvFlag) {
-    querySQL += ` and pv_flag = '${query.pvFlag}' `;
-  }
-
-  if (query.origSeverity) {
-    querySQL += ` and orig_severity in('${query.origSeverity}' )`;
-  }
-
-  if (query.neId) {
-    querySQL += ` and ne_id like '%${query.neId}%' `;
-  }
-
-  if (query.neName) {
-    querySQL += ` and ne_name like '%${query.neName}%' `;
-  }
-
-  if (query.neType) {
-    querySQL += ` and ne_type like '%${query.neType}%' `;
-  }
-
-  if (query.beginTime && query.endTime) {
-    querySQL += ` and event_time BETWEEN '${query.beginTime}' and ' ${query.endTime}'`;
-  }
-
-  // 分页
-  const pageNum = (query.pageNum - 1) * query.pageSize;
-  const limtSql = ` order by event_time desc limit ${pageNum},${query.pageSize} `;
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm`,
+export async function listAct(query: Record<string, any>) {
+  return await request({
+    url: `/neData/alarm/list`,
     method: 'GET',
-    params: {
-      SQL: totalSQL + querySQL,
-      rowsSQL: rowsSQL + querySQL + limtSql,
-    },
+    params: query,
   });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data = {
-      data: { total: 0, rows: [] as any },
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.data.total = itemData[0]['total'];
-        } else {
-          data.data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
 }
 
 /**
diff --git a/src/api/faultManage/eventAlarm.ts b/src/api/faultManage/eventAlarm.ts
index 30c7256c..f0b0d1d7 100644
--- a/src/api/faultManage/eventAlarm.ts
+++ b/src/api/faultManage/eventAlarm.ts
@@ -8,72 +8,11 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * @returns object
  */
 export async function listAct(query: Record<string, any>) {
-  let totalSQL = `select count(*)  as total from alarm_event where 1=1  `;
-  let rowsSQL = `select * from alarm_event where 1=1  `;
-  // 查询
-  let querySQL = '';
-  if (query.alarmCode) {
-    querySQL += ` and alarm_code = '${query.alarmCode}' `;
-  }
-
-  if (query.alarmType) {
-    querySQL += ` and alarm_type = '${query.alarmType}' `;
-  }
-
-  if (query.pvFlag) {
-    querySQL += ` and pv_flag = '${query.pvFlag}' `;
-  }
-
-  if (query.neId) {
-    querySQL += ` and ne_id like '%${query.neId}%' `;
-  }
-
-  if (query.neName) {
-    querySQL += ` and ne_name like '%${query.neName}%' `;
-  }
-
-  if (query.neType) {
-    querySQL += ` and ne_type like '%${query.neType}%' `;
-  }
-
-  if (query.beginTime && query.endTime) {
-    querySQL += ` and event_time BETWEEN '${query.beginTime}' and ' ${query.endTime}'`;
-  }
-
-  // 分页
-  const pageNum = (query.pageNum - 1) * query.pageSize;
-  const limtSql = ` order by event_time desc limit ${pageNum},${query.pageSize} `;
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm_event`,
+  return await request({
+    url: `/neData/alarm/log/event`,
     method: 'GET',
-    params: {
-      SQL: totalSQL + querySQL,
-      rowsSQL: rowsSQL + querySQL + limtSql,
-    },
+    params: query,
   });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data = {
-      data: { total: 0, rows: [] as any },
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm_event'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.data.total = itemData[0]['total'];
-        } else {
-          data.data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
 }
 
 /**
diff --git a/src/api/faultManage/historyAlarm.ts b/src/api/faultManage/historyAlarm.ts
index c789c237..f6648b36 100644
--- a/src/api/faultManage/historyAlarm.ts
+++ b/src/api/faultManage/historyAlarm.ts
@@ -10,62 +10,11 @@ import useUserStore from '@/store/modules/user';
  * @returns object
  */
 export async function listAct(query: Record<string, any>) {
-  let totalSQL = `select count(*)  as total from alarm where alarm_status='0'`;
-  let rowsSQL = `select * from alarm where alarm_status='0'`;
-  // 查询
-  let querySQL = '';
-  querySQL += query.alarm_code
-    ? ` and alarm_code = '${query.alarm_code}' `
-    : '';
-  querySQL += query.alarm_type
-    ? ` and alarm_type = '${query.alarm_type}' `
-    : '';
-  querySQL += query.pv_flag ? ` and pv_flag = '${query.pv_flag}' ` : '';
-  querySQL += query.orig_severity
-    ? ` and orig_severity in('${query.orig_severity}' )`
-    : '';
-  querySQL += query.ne_id ? ` and ne_id like '%${query.ne_id}%' ` : '';
-  querySQL += query.ne_name ? ` and ne_name like '%${query.ne_name}%' ` : '';
-  querySQL += query.ne_type ? ` and ne_type like '%${query.ne_type}%' ` : '';
-  querySQL +=
-    query.beginTime && query.endTime
-      ? ` and event_time BETWEEN '${query.beginTime}' and ' ${query.endTime}'`
-      : '';
-
-  // 分页
-  const pageNum = (query.pageNum - 1) * query.pageSize;
-  const limtSql = ` order by clear_time desc limit ${pageNum},${query.pageSize} `;
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm`,
+  return await request({
+    url: `/neData/alarm/list`,
     method: 'GET',
-    params: {
-      SQL: totalSQL + querySQL,
-      rowsSQL: rowsSQL + querySQL + limtSql,
-    },
+    params: query,
   });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data = {
-      data: { total: 0, rows: [] as any },
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.data.total = itemData[0]['total'];
-        } else {
-          data.data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
 }
 
 /**
diff --git a/src/api/logManage/alarm.ts b/src/api/logManage/alarm.ts
index 69ecaae2..11f122a4 100644
--- a/src/api/logManage/alarm.ts
+++ b/src/api/logManage/alarm.ts
@@ -1,6 +1,4 @@
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
-import { parseObjLineToHump } from '@/utils/parse-utils';
 
 /**
  * 查询日志列表
@@ -8,64 +6,9 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * @returns object
  */
 export async function listAlarm(query: Record<string, any>) {
-  let totalSQL = 'select count(*) as total from alarm_log where 1=1 ';
-  let rowsSQL = 'select * from alarm_log where 1=1 ';
-
-  // 查询
-  let querySQL = '';
-  if (query.neType) {
-    querySQL += ` and ne_type like '%${query.neType}%' `;
-  }
-  if (query.status) {
-    querySQL += ` and alarm_status = '${query.status}' `;
-  }
-  if (query.beginTime) {
-    querySQL += ` and event_time >= '${new Date(query.beginTime).valueOf()}' `;
-  }
-  if (query.endTime) {
-    querySQL += ` and event_time <= '${new Date(query.endTime).valueOf()}' `;
-  }
-
-  // 排序
-  let sortSql = ' order by event_time ';
-  if (query.sortOrder === 'asc') {
-    sortSql += ' asc ';
-  } else {
-    sortSql += ' desc ';
-  }
-
-  // 分页
-  const pageNum = (query.pageNum - 1) * query.pageSize;
-  const limtSql = ` limit ${pageNum},${query.pageSize} `;
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm_log`,
+  return await request({
+    url: `/neData/alarm/log/list`,
     method: 'GET',
-    params: {
-      totalSQL: totalSQL + querySQL,
-      rowsSQL: rowsSQL + querySQL + sortSql + limtSql,
-    },
+    params: query,
   });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data = {
-      data: { total: 0, rows: [] as any },
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm_log'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.data.total = itemData[0]['total'];
-        } else {
-          data.data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
 }
diff --git a/src/api/logManage/forwarding.ts b/src/api/logManage/forwarding.ts
index ee2a05e9..fd8d057c 100644
--- a/src/api/logManage/forwarding.ts
+++ b/src/api/logManage/forwarding.ts
@@ -1,6 +1,4 @@
-import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { request } from '@/plugins/http-fetch';
-import { parseObjLineToHump } from '@/utils/parse-utils';
 
 /**
  * 查询日志列表
@@ -8,61 +6,9 @@ import { parseObjLineToHump } from '@/utils/parse-utils';
  * @returns object
  */
 export async function listForwarding(query: Record<string, any>) {
-  let totalSQL = 'select count(*) as total from alarm_forward_log where 1=1 ';
-  let rowsSQL = 'select * from alarm_forward_log where 1=1 ';
-
-  // 查询
-  let querySQL = '';
-  if (query.neType) {
-    querySQL += ` and ne_type like '%${query.neType}%' `;
-  }
-  if (query.beginTime) {
-    querySQL += ` and event_time >= '${new Date(query.beginTime).valueOf()}' `;
-  }
-  if (query.endTime) {
-    querySQL += ` and event_time <= '${new Date(query.endTime).valueOf()}' `;
-  }
-
-  // 排序
-  let sortSql = ' order by event_time ';
-  if (query.sortOrder === 'asc') {
-    sortSql += ' asc ';
-  } else {
-    sortSql += ' desc ';
-  }
-
-  // 分页
-  const pageNum = (query.pageNum - 1) * query.pageSize;
-  const limtSql = ` limit ${pageNum},${query.pageSize} `;
-
-  // 发起请求
-  const result = await request({
-    url: `/api/rest/databaseManagement/v1/select/omc_db/alarm_forward_log`,
+  return await request({
+    url: `/neData/alarm/forward/log/list`,
     method: 'GET',
-    params: {
-      totalSQL: totalSQL + querySQL,
-      rowsSQL: rowsSQL + querySQL + sortSql + limtSql,
-    },
+    params: query,
   });
-
-  // 解析数据
-  if (result.code === RESULT_CODE_SUCCESS) {
-    const data = {
-      data: { total: 0, rows: [] as any },
-      code: result.code,
-      msg: result.msg,
-    };
-    result.data.data.forEach((item: any) => {
-      const itemData = item['alarm_forward_log'];
-      if (Array.isArray(itemData)) {
-        if (itemData.length === 1 && itemData[0]['total'] >= 0) {
-          data.data.total = itemData[0]['total'];
-        } else {
-          data.data.rows = itemData.map(v => parseObjLineToHump(v));
-        }
-      }
-    });
-    return data;
-  }
-  return result;
 }
diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index 757c6651..d09b6865 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1096,13 +1096,9 @@ export default {
     faultManage: {
       activeAlarm: {
         all:'All',
-        neType: 'NE Type',
-        neName: 'NE Name',
-        neId: 'NE UID',
         alarmCode: 'Alarm Code',
         origLevel: 'Severity',
         eventTime: 'Event Time',
-        pvFlag: 'PV Flag',
         alarmType: 'Alarm Type',
         confirm: 'Confirm',
         updateConfirm: 'Cancel Confirm',
@@ -1111,7 +1107,7 @@ export default {
         mySelf: 'Personalization',
         exportAll: 'Export All',
         disPlayFilfter: 'Display Filters',
-        alarmId:'ID',
+        alarmId:'Alarm ID',
         alarmTitle:'Title',
         clearUser:'Clear User',
         clearType:'Clear Type',
@@ -1160,12 +1156,13 @@ export default {
     },
     logManage:{
       alarm:{
-        type:'NE Type',
-        neId:'NE UID',
         alarmId:'Alarm ID',
         alarmSeq:'Sequence Number',
         alarmCode:'Alarm Code',
+        alarmTitle: 'Alarm Time',
         alarmStatus:'Status',
+        alarmType:'Alarm Type',
+        origSeverity:'Severity',
         eventTime:'Event Time',
         logTime:'Recording Time',
         status:'Status',
@@ -1179,14 +1176,16 @@ export default {
         logTime:'Log Time'
       },
       forwarding:{
-        type:'NE Type',
-        neId:'NE UID',
         alarmId:'Alarm ID',
         alarmSeq:'Sequence Number',
+        alarmCode:'Alarm Code',
         alarmObj:'Forward Users',
         alarmInter:'Forward Interface',
         alarmTitle:'Alarm Title',
         alarmInfo:'Operation Results',
+        alarmStatus:'Status',
+        alarmType:'Alarm Type',
+        origSeverity:'Severity',
         eventTime:'Event Time',
         logTime:'Log Time'
       },
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index aecdfbe9..5bbaae68 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1096,13 +1096,9 @@ export default {
     faultManage: {
       activeAlarm: {
         all:'所有',
-        neType: '告警设备类型',
-        neName: '告警网元名称',
-        neId: '告警网元标识',
         alarmCode: '告警编号',
         origLevel: '告警级别',
         eventTime: '告警产生时间',
-        pvFlag: '虚拟化标识',
         alarmType: '告警类型',
         confirm: '确认',
         updateConfirm: '取消确认',
@@ -1160,12 +1156,13 @@ export default {
     },
     logManage:{
       alarm:{
-        type:'网元类型',
-        neId:'告警网元标识',
         alarmId:'告警唯一标识',
-        alarmSeq:'告警流水号',
-        alarmCode:'告警编号',
+        alarmSeq: '告警流水号',
+        alarmCode: '告警编号',
+        alarmTitle: '告警标题',
         alarmStatus:'告警状态',
+        alarmType:'告警类型',
+        origSeverity: '告警级别',
         eventTime:'告警产生时间',
         logTime:'记录时间',
         status:'告警状态'
@@ -1179,14 +1176,16 @@ export default {
         logTime:'log Time'
       },
       forwarding:{
-        type:'网元类型',
-        neId:'告警网元标识',
         alarmId:'告警唯一标识',
         alarmSeq:'告警流水号',
+        alarmCode: '告警编号',
         alarmObj:'告警前转对象',
         alarmInter:'告警前转接口',
         alarmTitle:'告警标题',
         alarmInfo:'操作结果',
+        alarmStatus:'告警状态',
+        alarmType:'告警类型',
+        origSeverity: '告警级别',
         eventTime:'告警产生时间',
         logTime:'记录时间'
       },
diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue
index c46fec51..f68df70a 100644
--- a/src/views/faultManage/active-alarm/index.vue
+++ b/src/views/faultManage/active-alarm/index.vue
@@ -24,6 +24,7 @@ import { writeSheet } from '@/utils/execl-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { readLoalXlsx } from '@/utils/execl-utils';
 import { parseDateToStr } from '@/utils/date-utils';
+import dayjs, { type Dayjs } from 'dayjs';
 const neInfoStore = useNeInfoStore();
 const { getDict } = useDictStore();
 const { t, currentLocale } = useI18n();
@@ -48,11 +49,29 @@ let dict: {
 /**表格字段列排序 */
 let tableColumnsDnd = ref<ColumnsType>([]);
 
-/**记录开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+/**开始结束时间 */
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);
+/**时间范围 */
+let rangePickerPresets = ref([
+  {
+    label: 'Now hour',
+    value: [dayjs().startOf('hour'), dayjs().endOf('hour')],
+  },
+  { label: 'Today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  {
+    label: 'Yesterday',
+    value: [
+      dayjs().subtract(1, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
+  },
+]);
 
 /**查询参数 */
 let queryParams = reactive({
+  alarmStatus: 1,
+  sortField: 'event_time',
+  sortOrder: 'desc',
   /**告警设备类型 */
   neType: '',
   /**告警网元名称 */
@@ -63,10 +82,10 @@ let queryParams = reactive({
   alarmCode: '',
   /**告警级别 */
   origSeverity: undefined,
-  beginTime: '',
-  endTime: '',
-  /**告警产生时间 */
-  eventTime: '',
+  /**告警产生时间开始时间 */
+  beginTime: undefined as undefined | number,
+  /**告警产生时间结束时间 */
+  endTime: undefined as undefined | number,
   /**虚拟化标识 */
   pvFlag: undefined,
   /**告警类型 */
@@ -75,11 +94,14 @@ let queryParams = reactive({
   pageNum: 1,
   /**每页条数 */
   pageSize: 20,
+  /**条件sql */
+  sql: undefined,
 });
 
 /**查询参数重置 */
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
+    alarmStatus: 1,
     /**告警设备类型 */
     neType: '',
     /**告警网元名称 */
@@ -91,13 +113,15 @@ function fnQueryReset() {
     /**告警级别 */
     origSeverity: undefined,
     /**告警产生时间 */
-    eventTime: '',
+    beginTime: undefined,
+    endTime: undefined,
     /**虚拟化标识 */
     pvFlag: undefined,
     /**告警类型 */
     alarmType: undefined,
     /**当前页数 */
   });
+  queryRangePicker.value = undefined;
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -143,31 +167,33 @@ let alarmTableState: TabeStateType = reactive({
 
 /**表格字段列 */
 let tableColumns: ColumnsType = [
+  {
+    title: t('views.faultManage.activeAlarm.alarmType'),
+    dataIndex: 'alarmType',
+    key: 'alarmType',
+    align: 'left',
+    width: 150,
+  },
   {
     title: t('views.faultManage.activeAlarm.origLevel'),
-    align: 'center',
+    align: 'left',
     key: 'origSeverity',
     dataIndex: 'origSeverity',
-    width: 5,
+    width: 100,
   },
   {
     title: t('views.faultManage.activeAlarm.alarmTitle'),
     dataIndex: 'alarmTitle',
     align: 'left',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neType'),
-    dataIndex: 'neType',
-    align: 'center',
-    width: 5,
+    width: 200,
+    ellipsis: true,
   },
+
   {
     title: t('views.faultManage.activeAlarm.eventTime'),
     dataIndex: 'eventTime',
-    align: 'center',
-    sorter: (a: any, b: any) => 1,
-    width: 5,
+    align: 'left',
+    width: 150,
     customRender(opt) {
       if (typeof opt.value === 'number') {
         return parseDateToStr(+opt.value);
@@ -175,129 +201,118 @@ let tableColumns: ColumnsType = [
       return opt.value;
     },
   },
-  {
-    title: t('views.faultManage.activeAlarm.alarmCode'),
-    dataIndex: 'alarmCode',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.alarmType'),
-    dataIndex: 'alarmType',
-    key: 'alarmType',
-    align: 'left',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neName'),
-    dataIndex: 'neName',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neId'),
-    dataIndex: 'neId',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.pvFlag'),
-    dataIndex: 'pvFlag',
-    align: 'center',
-    width: 5,
-  },
   {
     title: t('views.faultManage.activeAlarm.alarmId'),
     dataIndex: 'alarmId',
-    align: 'center',
-    width: 5,
-  },
-
-  {
-    title: t('views.faultManage.activeAlarm.ackState'),
-    dataIndex: 'ackState',
-    key: 'ackState',
     align: 'left',
-    width: 5,
+    width: 150,
+    ellipsis: true,
   },
   {
-    title: t('views.faultManage.activeAlarm.ackUser'),
-    dataIndex: 'ackUser',
+    title: t('views.faultManage.activeAlarm.alarmCode'),
+    dataIndex: 'alarmCode',
     align: 'left',
-    width: 5,
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neType'),
+    dataIndex: 'neType',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neName'),
+    dataIndex: 'neName',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neId'),
+    dataIndex: 'neId',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.neInfo.pvflag'),
+    dataIndex: 'pvFlag',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('common.operate'),
-    key: 'alarm_id',
-    align: 'center',
+    key: 'id',
+    align: 'left',
     fixed: 'right',
-    width: 5,
+    width: 100,
   },
 ];
 
 /**帮助文档表格字段列 */
-let alarmTableColumns: ColumnsType = [
+let alarmTableColumns = ref<ColumnsType>([
   {
-    title: t('views.faultManage.activeAlarm.alarmTitle'),
-    dataIndex: 'alarmName',
-    align: 'center',
-    width: 3,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.locationInfo'),
-    dataIndex: 'alarmInfo',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.addInfo'),
-    dataIndex: 'helpInfo',
-    align: 'center',
-    width: 8,
+    title: t('views.faultManage.activeAlarm.alarmCode'),
+    dataIndex: 'alarmCode',
+    align: 'left',
+    width: 100,
   },
   {
     title: t('views.faultManage.activeAlarm.alarmType'),
     dataIndex: 'alarmType',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.origLevel'),
-    dataIndex: 'alarmLevel',
-    align: 'center',
-    width: 3,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.alarmCode'),
-    dataIndex: 'alarmCode',
-    align: 'center',
-    width: 3,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.specificProblem'),
-    dataIndex: 'cause',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.faultManage.activeAlarm.clearType'),
     dataIndex: 'clearType',
-    align: 'center',
-    width: 3,
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.faultManage.activeAlarm.origLevel'),
+    dataIndex: 'alarmLevel',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.faultManage.activeAlarm.alarmTitle'),
+    dataIndex: 'alarmName',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.faultManage.activeAlarm.realTitle'),
     dataIndex: 'enTitle',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.faultManage.activeAlarm.locationInfo'),
+    dataIndex: 'alarmInfo',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.faultManage.activeAlarm.objectNf'),
     dataIndex: 'objNf',
-    align: 'center',
-    width: 2,
+    align: 'left',
+    width: 100,
   },
-];
+  {
+    title: t('views.faultManage.activeAlarm.specificProblem'),
+    dataIndex: 'cause',
+    align: 'left',
+    width: 200,
+  },
+  {
+    title: t('views.faultManage.activeAlarm.addInfo'),
+    dataIndex: 'helpInfo',
+    align: 'left',
+    width: 300,
+    resizable: true,
+    minWidth: 150,
+    maxWidth: 400,
+  },
+]);
 
 /**表格分页器参数 */
 let tablePagination = reactive({
@@ -728,41 +743,53 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
   }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
-  getPass().then(res => {
+
+  // getPass().then(res => {
+  //   if (res.code === RESULT_CODE_SUCCESS) {
+  //     let sql = res.data.data[0]['config'][0].value
+  //       ? res.data.data[0]['config'][0].value
+  //       : '';
+  //     filterState.sql = sql;
+  //   }
+
+  // });
+
+  const form = toRaw(queryParams);
+  form.sql = filterState.sql;
+  listAct(form).then((res: any) => {
     if (res.code === RESULT_CODE_SUCCESS) {
-      let sql = res.data.data[0]['config'][0].value
-        ? res.data.data[0]['config'][0].value
-        : '';
-      filterState.sql = sql;
-    }
-    listAct(toRaw(queryParams), filterState.sql).then((res: any) => {
-      if (res.code === RESULT_CODE_SUCCESS) {
-        // 取消勾选
-        if (state.selectedRowKeys.length > 0) {
-          state.selectedRowKeys = [];
-        }
-        const { total, rows } = res.data;
-        tablePagination.total = total;
-        tableState.data = rows;
-        if (
-          tablePagination.total <=
-            (queryParams.pageNum - 1) * tablePagination.pageSize &&
-          queryParams.pageNum !== 1
-        ) {
-          tableState.loading = false;
-          fnGetList(queryParams.pageNum - 1);
-        }
-      } else {
-        tablePagination.total = 0;
-        tableState.data = [];
+      // 取消勾选
+      if (state.selectedRowKeys.length > 0) {
+        state.selectedRowKeys = [];
       }
-      tableState.loading = false;
-    });
+      const { total, rows } = res.data;
+      tablePagination.total = total;
+      tableState.data = rows;
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
+        tableState.loading = false;
+        fnGetList(queryParams.pageNum - 1);
+      }
+    } else {
+      tablePagination.total = 0;
+      tableState.data = [];
+    }
+    tableState.loading = false;
   });
 }
 
@@ -788,8 +815,11 @@ onMounted(() => {
     }
   });
   // 获取网元网元列表
-  useNeInfoStore().fnNelist();
-  fnGetList();
+  useNeInfoStore()
+    .fnNelist()
+    .finally(() => {
+      fnGetList();
+    });
 });
 </script>
 
@@ -804,62 +834,16 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neType')"
-              name="neType"
-            >
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="neInfoStore.getNeSelectOtions"
                 allow-clear
-                :placeholder="t('common.inputPlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neName')"
-              name="ne_name"
-            >
-              <a-input v-model:value="queryParams.neName" allow-clear></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neId')"
-              name="ne_id"
-            >
-              <a-input v-model:value="queryParams.neId" allow-clear></a-input>
-            </a-form-item>
-          </a-col>
 
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item>
-              <a-space :size="8">
-                <a-button type="primary" @click.prevent="fnGetList(1)">
-                  <template #icon><SearchOutlined /></template>
-                  {{ t('common.search') }}
-                </a-button>
-                <a-button type="default" @click.prevent="fnQueryReset">
-                  <template #icon><ClearOutlined /></template>
-                  {{ t('common.reset') }}
-                </a-button>
-              </a-space>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmCode')"
-              name="alarm_code"
-            >
-              <a-input
-                v-model:value="queryParams.alarmCode"
-                allow-clear
-              ></a-input>
-            </a-form-item>
-          </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.origLevel')"
@@ -873,37 +857,6 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.eventTime')"
-              name="eventTime"
-            >
-              <a-range-picker
-                v-model:value="queryRangePicker"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                show-time
-                style="width: 400px"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.pvFlag')"
-              name="pv_flag"
-            >
-              <a-select
-                v-model:value="queryParams.pvFlag"
-                :placeholder="t('common.selectPlease')"
-                :options="[
-                  { label: 'PNF', value: 'PNF' },
-                  { label: 'VNF', value: 'VNF' },
-                ]"
-              />
-            </a-form-item>
-          </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.alarmType')"
@@ -916,6 +869,50 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarm_code"
+            >
+              <a-input
+                v-model:value="queryParams.alarmCode"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.eventTime')"
+              name="eventTime"
+            >
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                :presets="rangePickerPresets"
+                :bordered="true"
+                :allow-clear="false"
+                style="width: 100%"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+              ></a-range-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item>
+              <a-space :size="8">
+                <a-button type="primary" @click.prevent="fnGetList(1)">
+                  <template #icon><SearchOutlined /></template>
+                  {{ t('common.search') }}
+                </a-button>
+                <a-button type="default" @click.prevent="fnQueryReset">
+                  <template #icon><ClearOutlined /></template>
+                  {{ t('common.reset') }}
+                </a-button>
+              </a-space>
+            </a-form-item>
+          </a-col>
         </a-row>
       </a-form>
     </a-card>
@@ -923,7 +920,7 @@ onMounted(() => {
     <a-card :bordered="false" :body-style="{ padding: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <a-space :size="8" align="center">
+        <a-space :size="8" align="center" v-if="false">
           <a-button
             type="primary"
             @click.prevent="fnCancelConfirm()"
@@ -1035,7 +1032,7 @@ onMounted(() => {
           onChange: onSelectChange,
         }"
         :pagination="tablePagination"
-        :scroll="{ x: 2500, y: 400 }"
+        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'origSeverity'">
@@ -1059,7 +1056,7 @@ onMounted(() => {
           <template v-if="column.key === 'ackState'">
             <DictTag :options="dict.activeAckState" :value="record.ackState" />
           </template>
-          <template v-if="column.key === 'alarm_id'">
+          <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip>
                 <template #title>{{ t('common.viewText') }}</template>
@@ -1111,7 +1108,8 @@ onMounted(() => {
         :data-source="alarmTableState.data"
         :size="alarmTableState.size"
         :pagination="false"
-        :scroll="{ x: 1700, y: '88vh' }"
+        :scroll="{ x: alarmTableColumns.length * 250, y: '88vh' }"
+        @resizeColumn="(w:number, col:any) => (col.width = w)"
       >
       </a-table>
     </ProModal>
@@ -1129,8 +1127,13 @@ onMounted(() => {
       @ok="fnModalOk"
       :ok-text="t('views.faultManage.activeAlarm.confirm')"
       @cancel="fnModalCancel"
-      :footer="false"
     >
+      <template v-slot:footer>
+        <a-button @click="fnModalCancel">
+          {{ t('views.faultManage.activeAlarm.closeModal') }}
+        </a-button>
+      </template>
+
       <a-form
         name="modalStateFrom"
         layout="horizontal"
@@ -1158,38 +1161,23 @@ onMounted(() => {
 
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neId')"
-              name="neId"
-            >
-              {{ modalState.from.neId }}
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neName')"
-              name="neName"
-            >
-              {{ modalState.from.neName }}
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neType')"
-              name="neType"
-            >
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               {{ modalState.from.neType }}
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmCode')"
-              name="alarmCode"
-            >
-              {{ modalState.from.alarmCode }}
+            <a-form-item :label="t('views.ne.common.neId')" name="neId">
+              {{ modalState.from.neId }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neName')" name="neName">
+              {{ modalState.from.neName }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.neInfo.pvflag')" name="pvFlag">
+              {{ modalState.from.pvFlag }}
             </a-form-item>
           </a-col>
         </a-row>
@@ -1227,10 +1215,10 @@ onMounted(() => {
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.pvFlag')"
-              name="pvFlag"
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarmCode"
             >
-              {{ modalState.from.pvFlag }}
+              {{ modalState.from.alarmCode }}
             </a-form-item>
           </a-col>
         </a-row>
diff --git a/src/views/faultManage/event/index.vue b/src/views/faultManage/event/index.vue
index 1ddbac0f..ad50cc28 100644
--- a/src/views/faultManage/event/index.vue
+++ b/src/views/faultManage/event/index.vue
@@ -8,42 +8,41 @@ import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/es/table';
 import { listAct, exportAll } from '@/api/faultManage/eventAlarm';
 import useI18n from '@/hooks/useI18n';
-import useDictStore from '@/store/modules/dict';
 import useNeInfoStore from '@/store/modules/neinfo';
 import saveAs from 'file-saver';
 import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import { writeSheet } from '@/utils/execl-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { parseDateToStr } from '@/utils/date-utils';
+import dayjs, { type Dayjs } from 'dayjs';
 const neInfoStore = useNeInfoStore();
-const { getDict } = useDictStore();
 const { t } = useI18n();
 
-/**字典数据 */
-let dict: {
-  /**活动告警类型 */
-  activeAlarmType: DictType[];
-  /**告警清除类型 */
-  activeClearType: DictType[];
-  /**告警清除类型 */
-  activeAckState: DictType[];
-  /**原始严重程度 */
-  activeAlarmSeverity: DictType[];
-} = reactive({
-  activeAlarmType: [],
-  activeClearType: [],
-  activeAckState: [],
-  activeAlarmSeverity: [],
-});
-
 /**表格字段列排序 */
 let tableColumnsDnd = ref<ColumnsType>([]);
 
-/**记录开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+/**开始结束时间 */
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);
+/**时间范围 */
+let rangePickerPresets = ref([
+  {
+    label: 'Now hour',
+    value: [dayjs().startOf('hour'), dayjs().endOf('hour')],
+  },
+  { label: 'Today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  {
+    label: 'Yesterday',
+    value: [
+      dayjs().subtract(1, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
+  },
+]);
 
 /**查询参数 */
 let queryParams = reactive({
+  sortField: 'event_time',
+  sortOrder: 'desc',
   /**告警设备类型 */
   neType: '',
   /**告警网元名称 */
@@ -54,10 +53,10 @@ let queryParams = reactive({
   alarmCode: '',
   /**告警级别 */
   origSeverity: undefined,
-  beginTime: '',
-  endTime: '',
-  /**告警产生时间 */
-  eventTime: '',
+  /**告警产生时间开始时间 */
+  beginTime: undefined as undefined | number,
+  /**告警产生时间结束时间 */
+  endTime: undefined as undefined | number,
   /**虚拟化标识 */
   pvFlag: undefined,
   /**告警类型 */
@@ -82,13 +81,15 @@ function fnQueryReset() {
     /**告警级别 */
     origSeverity: undefined,
     /**告警产生时间 */
-    eventTime: '',
+    beginTime: undefined,
+    endTime: undefined,
     /**虚拟化标识 */
     pvFlag: undefined,
     /**告警类型 */
     alarmType: undefined,
     /**当前页数 */
   });
+  queryRangePicker.value = undefined;
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -119,42 +120,19 @@ let tableState: TabeStateType = reactive({
 
 /**表格字段列 */
 let tableColumns: ColumnsType = [
-  {
-    title: t('views.faultManage.activeAlarm.alarmId'),
-    dataIndex: 'alarmId',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neId'),
-    dataIndex: 'neId',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neType'),
-    dataIndex: 'neType',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.alarmCode'),
-    dataIndex: 'alarmCode',
-    align: 'center',
-    width: 5,
-  },
   {
     title: t('views.faultManage.activeAlarm.alarmTitle'),
     dataIndex: 'alarmTitle',
     align: 'left',
-    width: 5,
+    width: 200,
+    ellipsis: true,
   },
+
   {
     title: t('views.faultManage.activeAlarm.eventTime'),
     dataIndex: 'eventTime',
-    align: 'center',
-    sorter: (a: any, b: any) => 1,
-    width: 5,
+    align: 'left',
+    width: 150,
     customRender(opt) {
       if (typeof opt.value === 'number') {
         return parseDateToStr(+opt.value);
@@ -162,12 +140,37 @@ let tableColumns: ColumnsType = [
       return opt.value;
     },
   },
+  {
+    title: t('views.faultManage.activeAlarm.alarmId'),
+    dataIndex: 'alarmId',
+    align: 'left',
+    width: 150,
+    ellipsis: true,
+  },
+  {
+    title: t('views.faultManage.activeAlarm.alarmCode'),
+    dataIndex: 'alarmCode',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neType'),
+    dataIndex: 'neType',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neId'),
+    dataIndex: 'neId',
+    align: 'left',
+    width: 100,
+  },
   {
     title: t('common.operate'),
-    key: 'alarm_id',
-    align: 'center',
+    key: 'id',
+    align: 'left',
     fixed: 'right',
-    width: 5,
+    width: 100,
   },
 ];
 
@@ -391,11 +394,18 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
   }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
 
   listAct(toRaw(queryParams)).then((res: any) => {
     if (res.code === RESULT_CODE_SUCCESS) {
@@ -424,29 +434,12 @@ function fnGetList(pageNum?: number) {
 }
 
 onMounted(() => {
-  // 初始字典数据
-  Promise.allSettled([
-    getDict('active_alarm_type'),
-    getDict('active_clear_type'),
-    getDict('active_ack_state'),
-    getDict('active_alarm_severity'),
-  ]).then(resArr => {
-    if (resArr[0].status === 'fulfilled') {
-      dict.activeAlarmType = resArr[0].value;
-    }
-    if (resArr[1].status === 'fulfilled') {
-      dict.activeClearType = resArr[1].value;
-    }
-    if (resArr[2].status === 'fulfilled') {
-      dict.activeAckState = resArr[2].value;
-    }
-    if (resArr[3].status === 'fulfilled') {
-      dict.activeAlarmSeverity = resArr[3].value;
-    }
-  });
   // 获取网元网元列表
-  useNeInfoStore().fnNelist();
-  fnGetList();
+  useNeInfoStore()
+    .fnNelist()
+    .finally(() => {
+      fnGetList();
+    });
 });
 </script>
 
@@ -460,37 +453,45 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neType')"
-              name="neType "
-            >
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="neInfoStore.getNeSelectOtions"
                 allow-clear
-                :placeholder="t('common.inputPlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
               />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.neName')"
-              name="ne_name"
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarm_code"
             >
-              <a-input v-model:value="queryParams.neName" allow-clear></a-input>
+              <a-input
+                v-model:value="queryParams.alarmCode"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="8" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.neId')"
-              name="ne_id"
+              :label="t('views.faultManage.activeAlarm.eventTime')"
+              name="eventTime"
             >
-              <a-input v-model:value="queryParams.neId" allow-clear></a-input>
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                :presets="rangePickerPresets"
+                :bordered="true"
+                :allow-clear="false"
+                style="width: 100%"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+              ></a-range-picker>
             </a-form-item>
           </a-col>
-
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="4" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">
@@ -505,69 +506,13 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmCode')"
-              name="alarm_code"
-            >
-              <a-input
-                v-model:value="queryParams.alarmCode"
-                allow-clear
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.pvFlag')"
-              name="pv_flag"
-            >
-              <a-select
-                v-model:value="queryParams.pvFlag"
-                :placeholder="t('common.selectPlease')"
-                :options="[
-                  { label: 'PNF', value: 'PNF' },
-                  { label: 'VNF', value: 'VNF' },
-                ]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.eventTime')"
-              name="eventTime"
-            >
-              <a-range-picker
-                v-model:value="queryRangePicker"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                show-time
-                style="width: 400px"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmType')"
-              name="alarm_type"
-            >
-              <a-select
-                v-model:value="queryParams.alarmType"
-                :placeholder="t('common.selectPlease')"
-                :options="dict.activeAlarmType"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
       </a-form>
     </a-card>
 
     <a-card :bordered="false" :body-style="{ padding: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <a-space :size="8" align="center">
+        <a-space :size="8" align="center" v-if="false">
           <a-button
             type="primary"
             @click.prevent="fnExportAll()"
@@ -622,7 +567,7 @@ onMounted(() => {
             </a-dropdown>
           </a-tooltip>
           <TableColumnsDnd
-            cache-id="alarmActive"
+            cache-id="alarmEvent"
             :columns="tableColumns"
             v-model:columns-dnd="tableColumnsDnd"
           ></TableColumnsDnd>
@@ -638,31 +583,10 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :pagination="tablePagination"
-        :scroll="{ x: tableColumns.length * 120, y: 400 }"
+        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'origSeverity'">
-            <DictTag
-              :options="dict.activeAlarmSeverity"
-              :value="record.origSeverity"
-            />
-          </template>
-          <template v-if="column.key === 'alarmType'">
-            <DictTag
-              :options="dict.activeAlarmType"
-              :value="record.alarmType"
-            />
-          </template>
-          <template v-if="column.key === 'clearType'">
-            <DictTag
-              :options="dict.activeClearType"
-              :value="record.clearType"
-            />
-          </template>
-          <template v-if="column.key === 'ackState'">
-            <DictTag :options="dict.activeAckState" :value="record.ackState" />
-          </template>
-          <template v-if="column.key === 'alarm_id'">
+          <template v-if="column?.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip>
                 <template #title>{{ t('common.viewText') }}</template>
@@ -692,9 +616,9 @@ onMounted(() => {
       @cancel="fnModalCancel"
     >
       <template v-slot:footer>
-        <a-button @click="fnModalCancel">{{
-          t('views.faultManage.activeAlarm.closeModal')
-        }}</a-button>
+        <a-button @click="fnModalCancel">
+          {{ t('views.faultManage.activeAlarm.closeModal') }}
+        </a-button>
       </template>
 
       <a-form
@@ -725,29 +649,23 @@ onMounted(() => {
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.neId')"
-              name="neId"
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarmCode"
             >
-              {{ modalState.from.neId }}
+              {{ modalState.from.alarmCode }}
             </a-form-item>
           </a-col>
         </a-row>
 
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neType')"
-              name="neType"
-            >
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               {{ modalState.from.neType }}
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmCode')"
-              name="alarmCode"
-            >
-              {{ modalState.from.alarmCode }}
+            <a-form-item :label="t('views.ne.common.neId')" name="neId">
+              {{ modalState.from.neId }}
             </a-form-item>
           </a-col>
         </a-row>
diff --git a/src/views/faultManage/history-alarm/index.vue b/src/views/faultManage/history-alarm/index.vue
index ecbf45cc..a916cafd 100644
--- a/src/views/faultManage/history-alarm/index.vue
+++ b/src/views/faultManage/history-alarm/index.vue
@@ -19,6 +19,7 @@ import saveAs from 'file-saver';
 import { writeSheet } from '@/utils/execl-utils';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { parseDateToStr } from '@/utils/date-utils';
+import dayjs, { type Dayjs } from 'dayjs';
 const neInfoStore = useNeInfoStore();
 const { getDict } = useDictStore();
 const { t } = useI18n();
@@ -40,32 +41,50 @@ let dict: {
   activeAlarmSeverity: [],
 });
 
-/**记录开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+/**开始结束时间 */
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);
+/**时间范围 */
+let rangePickerPresets = ref([
+  {
+    label: 'Now hour',
+    value: [dayjs().startOf('hour'), dayjs().endOf('hour')],
+  },
+  { label: 'Today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  {
+    label: 'Yesterday',
+    value: [
+      dayjs().subtract(1, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
+  },
+]);
 
 /**表格字段列排序 */
 let tableColumnsDnd = ref<ColumnsType>([]);
 
 /**查询参数 */
 let queryParams = reactive({
+  alarmStatus: 0,
+  sortField: 'event_time',
+  sortOrder: 'desc',
   /**告警设备类型 */
-  ne_type: '',
+  neType: '',
   /**告警网元名称 */
-  ne_name: '',
+  neName: '',
   /**告警网元标识 */
-  ne_id: '',
+  neId: '',
   /**告警编号 */
-  alarm_code: '',
+  alarmCode: '',
   /**告警级别 */
-  orig_severity: undefined,
-  beginTime: '',
-  endTime: '',
-  /**告警产生时间 */
-  eventTime: '',
+  origSeverity: undefined,
+  /**告警产生时间开始时间 */
+  beginTime: undefined as undefined | number,
+  /**告警产生时间结束时间 */
+  endTime: undefined as undefined | number,
   /**虚拟化标识 */
-  pv_flag: undefined,
+  pvFlag: undefined,
   /**告警类型 */
-  alarm_type: undefined,
+  alarmType: undefined,
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -75,24 +94,27 @@ let queryParams = reactive({
 /**查询参数重置 */
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
+    alarmStatus: 0,
     /**告警设备类型 */
-    ne_type: '',
+    neType: '',
     /**告警网元名称 */
-    ne_name: '',
+    neName: '',
     /**告警网元标识 */
-    ne_id: '',
+    neId: '',
     /**告警编号 */
-    alarm_code: '',
+    alarmCode: '',
     /**告警级别 */
-    orig_severity: undefined,
+    origSeverity: undefined,
     /**告警产生时间 */
-    eventTime: '',
+    beginTime: undefined,
+    endTime: undefined,
     /**虚拟化标识 */
-    pv_flag: undefined,
+    pvFlag: undefined,
     /**告警类型 */
-    alarm_type: undefined,
+    alarmType: undefined,
     /**当前页数 */
   });
+  queryRangePicker.value = undefined;
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -124,54 +146,31 @@ let tableState: TabeStateType = reactive({
 /**表格字段列 */
 let tableColumns: ColumnsType = [
   {
-    title: t('views.faultManage.activeAlarm.alarmId'),
-    dataIndex: 'alarmId',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neId'),
-    dataIndex: 'neId',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neName'),
-    dataIndex: 'neName',
-    align: 'center',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.neType'),
-    dataIndex: 'neType',
-    align: 'center',
-    width: 5,
+    title: t('views.faultManage.activeAlarm.alarmType'),
+    dataIndex: 'alarmType',
+    key: 'alarmType',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.faultManage.activeAlarm.origLevel'),
     align: 'left',
-    dataIndex: 'origSeverity',
     key: 'origSeverity',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.alarmCode'),
-    dataIndex: 'alarmCode',
-    align: 'center',
-    width: 5,
+    dataIndex: 'origSeverity',
+    width: 100,
   },
   {
     title: t('views.faultManage.activeAlarm.alarmTitle'),
     dataIndex: 'alarmTitle',
     align: 'left',
-    width: 5,
+    width: 200,
+    ellipsis: true,
   },
   {
     title: t('views.faultManage.activeAlarm.eventTime'),
     dataIndex: 'eventTime',
-    align: 'center',
-    sorter: (a: any, b: any) => 1,
-    width: 5,
+    align: 'left',
+    width: 150,
     customRender(opt) {
       if (typeof opt.value === 'number') {
         return parseDateToStr(+opt.value);
@@ -180,37 +179,60 @@ let tableColumns: ColumnsType = [
     },
   },
   {
-    title: t('views.faultManage.activeAlarm.alarmType'),
-    dataIndex: 'alarmType',
-    key: 'alarmType',
+    title: t('views.faultManage.activeAlarm.alarmId'),
+    dataIndex: 'alarmId',
     align: 'left',
-    width: 5,
+    width: 150,
+    ellipsis: true,
   },
   {
-    title: t('views.faultManage.activeAlarm.pvFlag'),
+    title: t('views.faultManage.activeAlarm.alarmCode'),
+    dataIndex: 'alarmCode',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neType'),
+    dataIndex: 'neType',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neName'),
+    dataIndex: 'neName',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.common.neId'),
+    dataIndex: 'neId',
+    align: 'left',
+    width: 100,
+  },
+  {
+    title: t('views.ne.neInfo.pvflag'),
     dataIndex: 'pvFlag',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.faultManage.activeAlarm.clearUser'),
     dataIndex: 'clearUser',
     align: 'left',
-    width: 5,
+    width: 100,
   },
   {
     title: t('views.faultManage.activeAlarm.clearType'),
     dataIndex: 'clearType',
     key: 'clearType',
     align: 'left',
-    width: 5,
+    width: 150,
   },
   {
     title: t('views.faultManage.activeAlarm.clearTime'),
     dataIndex: 'clearTime',
     align: 'left',
-    sorter: (a: any, b: any) => 1,
-    width: 5,
+    width: 150,
     customRender(opt) {
       if (typeof opt.value === 'number') {
         return parseDateToStr(+opt.value);
@@ -218,25 +240,12 @@ let tableColumns: ColumnsType = [
       return opt.value;
     },
   },
-  {
-    title: t('views.faultManage.activeAlarm.ackState'),
-    dataIndex: 'ackState',
-    key: 'ackState',
-    align: 'left',
-    width: 5,
-  },
-  {
-    title: t('views.faultManage.activeAlarm.ackUser'),
-    dataIndex: 'ackUser',
-    align: 'left',
-    width: 5,
-  },
   {
     title: t('common.operate'),
-    key: 'alarm_id',
-    align: 'center',
+    key: 'id',
+    align: 'left',
     fixed: 'right',
-    width: 5,
+    width: 100,
   },
 ];
 
@@ -547,11 +556,19 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
   }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
   listAct(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       // 取消勾选
@@ -615,38 +632,71 @@ onMounted(() => {
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neType')"
-              name="ne_type"
-            >
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               <a-auto-complete
-                v-model:value="queryParams.ne_type"
+                v-model:value="queryParams.neType"
                 :options="neInfoStore.getNeSelectOtions"
                 allow-clear
-                :placeholder="t('common.inputPlease')"
+                :placeholder="t('views.ne.common.neTypePlease')"
+              />
+            </a-form-item>
+          </a-col>
+
+          <a-col :lg="6" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.origLevel')"
+              name="orig_severity"
+            >
+              <a-select
+                v-model:value="queryParams.origSeverity"
+                :placeholder="t('common.selectPlease')"
+                allow-clear
+                :options="dict.activeAlarmSeverity"
               />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.neName')"
-              name="ne_name"
+              :label="t('views.faultManage.activeAlarm.alarmType')"
+              name="alarm_type"
             >
-              <a-input
-                v-model:value="queryParams.ne_name"
-                allow-clear
-              ></a-input>
+              <a-select
+                v-model:value="queryParams.alarmType"
+                :placeholder="t('common.selectPlease')"
+                :options="dict.activeAlarmType"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.neId')"
-              name="ne_id"
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarm_code"
             >
-              <a-input v-model:value="queryParams.ne_id" allow-clear></a-input>
+              <a-input
+                v-model:value="queryParams.alarmCode"
+                allow-clear
+                :placeholder="t('common.inputPlease')"
+              ></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="16">
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.eventTime')"
+              name="eventTime"
+            >
+              <a-range-picker
+                v-model:value="queryRangePicker"
+                :presets="rangePickerPresets"
+                :bordered="true"
+                :allow-clear="false"
+                style="width: 100%"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
+              ></a-range-picker>
             </a-form-item>
           </a-col>
-
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
@@ -662,87 +712,17 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmCode')"
-              name="alarm_code"
-            >
-              <a-input
-                v-model:value="queryParams.alarm_code"
-                allow-clear
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.origLevel')"
-              name="orig_severity"
-            >
-              <a-select
-                v-model:value="queryParams.orig_severity"
-                :placeholder="t('common.selectPlease')"
-                allow-clear
-                :options="dict.activeAlarmSeverity"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.eventTime')"
-              name="eventTime"
-            >
-              <a-range-picker
-                v-model:value="queryRangePicker"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
-                show-time
-                style="width: 400px"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.pvFlag')"
-              name="pv_flag"
-            >
-              <a-select
-                v-model:value="queryParams.pv_flag"
-                :placeholder="t('common.selectPlease')"
-                :options="[
-                  { label: 'PNF', value: 'PNF' },
-                  { label: 'VNF', value: 'VNF' },
-                ]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmType')"
-              name="alarm_type"
-            >
-              <a-select
-                v-model:value="queryParams.alarm_type"
-                :placeholder="t('common.selectPlease')"
-                :options="dict.activeAlarmType"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
       </a-form>
     </a-card>
 
     <a-card :bordered="false" :body-style="{ padding: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <a-space :size="8" align="center">
+        <a-space :size="8" align="center" v-if="false">
           <a-button
             type="primary"
             @click.prevent="fnCancelConfirm()"
             :disabled="state.selectedRowKeys.length <= 0"
-            v-if="false"
           >
             <template #icon>
               <CloseOutlined />
@@ -824,7 +804,7 @@ onMounted(() => {
           onChange: onSelectChange,
         }"
         :pagination="tablePagination"
-        :scroll="{ x: tableColumns.length * 120, y: 400 }"
+        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'origSeverity'">
@@ -848,7 +828,7 @@ onMounted(() => {
           <template v-if="column.key === 'ackState'">
             <DictTag :options="dict.activeAckState" :value="record.ackState" />
           </template>
-          <template v-if="column.key === 'alarm_id'">
+          <template v-if="column.key === 'id'">
             <a-space :size="8" align="center">
               <a-tooltip>
                 <template #title>{{ t('common.viewText') }}</template>
@@ -878,8 +858,13 @@ onMounted(() => {
       @ok="fnModalOk"
       :ok-text="t('views.faultManage.activeAlarm.confirm')"
       @cancel="fnModalCancel"
-      :footer="false"
     >
+      <template v-slot:footer>
+        <a-button @click="fnModalCancel">
+          {{ t('views.faultManage.activeAlarm.closeModal') }}
+        </a-button>
+      </template>
+
       <a-form
         name="modalStateFrom"
         layout="horizontal"
@@ -906,38 +891,23 @@ onMounted(() => {
 
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neId')"
-              name="neId"
-            >
-              {{ modalState.from.neId }}
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neName')"
-              name="neName"
-            >
-              {{ modalState.from.neName }}
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.neType')"
-              name="neType"
-            >
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               {{ modalState.from.neType }}
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmCode')"
-              name="alarmCode"
-            >
-              {{ modalState.from.alarmCode }}
+            <a-form-item :label="t('views.ne.common.neId')" name="neId">
+              {{ modalState.from.neId }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neName')" name="neName">
+              {{ modalState.from.neName }}
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.neInfo.pvflag')" name="pvFlag">
+              {{ modalState.from.pvFlag }}
             </a-form-item>
           </a-col>
         </a-row>
@@ -962,15 +932,6 @@ onMounted(() => {
         </a-row>
 
         <a-row>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.pvFlag')"
-              name="pvFlag"
-            >
-              {{ modalState.from.pvFlag }}
-            </a-form-item>
-          </a-col>
-
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.alarmType')"
@@ -982,6 +943,14 @@ onMounted(() => {
               />
             </a-form-item>
           </a-col>
+          <a-col :lg="12" :md="12" :xs="24">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarmCode"
+            >
+              {{ modalState.from.alarmCode }}
+            </a-form-item>
+          </a-col>
         </a-row>
 
         <a-form-item
diff --git a/src/views/logManage/alarm/index.vue b/src/views/logManage/alarm/index.vue
index 5212d58a..fa1ad9e7 100644
--- a/src/views/logManage/alarm/index.vue
+++ b/src/views/logManage/alarm/index.vue
@@ -10,6 +10,7 @@ import { listAlarm } from '@/api/logManage/alarm';
 import useNeInfoStore from '@/store/modules/neinfo';
 import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
+import dayjs, { type Dayjs } from 'dayjs';
 const { getDict } = useDictStore();
 const { t } = useI18n();
 
@@ -17,22 +18,48 @@ const { t } = useI18n();
 let dict: {
   /**告警状态 */
   alarmStatus: DictType[];
+  /**活动告警类型 */
+  activeAlarmType: DictType[];
+  /**原始严重程度 */
+  activeAlarmSeverity: DictType[];
 } = reactive({
   alarmStatus: [],
+  activeAlarmType: [],
+  activeAlarmSeverity: [],
 });
 
-/**记录开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+/**开始结束时间 */
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);
+/**时间范围 */
+let rangePickerPresets = ref([
+  {
+    label: 'Now hour',
+    value: [dayjs().startOf('hour'), dayjs().endOf('hour')],
+  },
+  { label: 'Today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  {
+    label: 'Yesterday',
+    value: [
+      dayjs().subtract(1, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
+  },
+]);
 
 /**查询参数 */
 let queryParams = reactive({
   /**网元类型 */
   neType: '',
   /**告警状态 */
-  status: undefined,
-  /**记录时间 */
-  beginTime: '',
-  endTime: '',
+  alarmStatus: undefined,
+  /**告警类型 */
+  origSeverity: undefined,
+  sortField: 'event_time',
+  sortOrder: 'desc',
+  /**开始时间 */
+  beginTime: undefined as undefined | number,
+  /**结束时间 */
+  endTime: undefined as undefined | number,
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -43,13 +70,13 @@ let queryParams = reactive({
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     neType: '',
-    status: undefined,
-    beginTime: '',
-    endTime: '',
+    alarmStatus: undefined,
+    beginTime: undefined,
+    endTime: undefined,
     pageNum: 1,
     pageSize: 20,
   });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -71,7 +98,7 @@ type TabeStateType = {
 let tableState: TabeStateType = reactive({
   loading: false,
   size: 'middle',
-  seached: true,
+  seached: false,
   data: [],
 });
 
@@ -80,55 +107,85 @@ let tableColumns: ColumnsType = [
   {
     title: t('common.rowId'),
     dataIndex: 'id',
-    align: 'center',
+    align: 'left',
+    width: 100,
   },
   {
-    title: t('views.logManage.alarm.type'),
+    title: t('views.ne.common.neType'),
     dataIndex: 'neType',
-    align: 'center',
+    align: 'left',
+    width: 100,
   },
   {
-    title: t('views.logManage.alarm.neId'),
+    title: t('views.ne.common.neId'),
     dataIndex: 'neId',
-    align: 'center',
+    align: 'left',
+    width: 100,
   },
   {
     title: t('views.logManage.alarm.alarmId'),
     dataIndex: 'alarmId',
-    align: 'center',
+    align: 'left',
+    width: 120,
   },
   {
     title: t('views.logManage.alarm.alarmSeq'),
     dataIndex: 'alarmSeq',
-    align: 'center',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.logManage.alarm.alarmCode'),
     dataIndex: 'alarmCode',
-    align: 'center',
+    align: 'left',
+    width: 150,
+    ellipsis: true,
+  },
+  {
+    title: t('views.logManage.alarm.alarmTitle'),
+    dataIndex: 'alarmTitle',
+    align: 'left',
+    width: 200,
+    ellipsis: true,
   },
   {
     title: t('views.logManage.alarm.alarmStatus'),
     dataIndex: 'alarmStatus',
     key: 'alarmStatus',
-    align: 'center',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.logManage.alarm.alarmType'),
+    dataIndex: 'alarmType',
+    key: 'alarmType',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.logManage.alarm.origSeverity'),
+    dataIndex: 'origSeverity',
+    key: 'origSeverity',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.logManage.alarm.eventTime'),
     dataIndex: 'eventTime',
-    align: 'center',
+    align: 'left',
     customRender(opt) {
       if (!opt.value) return '';
-      return parseDateToStr(opt.value);
+      return parseDateToStr(+opt.value);
     },
+    width: 150,
   },
   {
     title: t('views.logManage.alarm.logTime'),
-    dataIndex: 'logTime',
-    align: 'center',
+    dataIndex: 'createdAt',
+    align: 'left',
     customRender(opt) {
       if (!opt.value) return '';
-      return parseDateToStr(opt.value);
+      return parseDateToStr(+opt.value);
     },
   },
 ];
@@ -170,20 +227,32 @@ function fnTableSize({ key }: MenuInfo) {
 function fnGetList(pageNum?: number) {
   if (tableState.loading) return;
   tableState.loading = true;
-  if(pageNum){
+  if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
   }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
   listAlarm(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS) {
+    if (res.code === RESULT_CODE_SUCCESS) {
       const { total, rows } = res.data;
       tablePagination.total = total;
       tableState.data = rows;
-      if (tablePagination.total <=(queryParams.pageNum - 1) * tablePagination.pageSize &&queryParams.pageNum !== 1) {
+      if (
+        tablePagination.total <=
+          (queryParams.pageNum - 1) * tablePagination.pageSize &&
+        queryParams.pageNum !== 1
+      ) {
         tableState.loading = false;
         fnGetList(queryParams.pageNum - 1);
       }
@@ -194,15 +263,28 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 初始字典数据
-  Promise.allSettled([getDict('alarm_status')]).then(resArr => {
+  Promise.allSettled([
+    getDict('alarm_status'),
+    getDict('active_alarm_type'),
+    getDict('active_alarm_severity'),
+  ]).then(resArr => {
     if (resArr[0].status === 'fulfilled') {
       dict.alarmStatus = resArr[0].value;
     }
+    if (resArr[1].status === 'fulfilled') {
+      dict.activeAlarmType = resArr[1].value;
+    }
+    if (resArr[2].status === 'fulfilled') {
+      dict.activeAlarmSeverity = resArr[2].value;
+    }
   });
   // 获取网元网元列表
-  useNeInfoStore().fnNelist();
-  // 获取列表数据
-  fnGetList();
+  useNeInfoStore()
+    .fnNelist()
+    .finally(() => {
+      // 获取列表数据
+      fnGetList();
+    });
 });
 </script>
 
@@ -216,19 +298,24 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item :label="t('views.logManage.alarm.type')" name="neType">
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="useNeInfoStore().getNeSelectOtions"
+                :placeholder="t('views.ne.common.neTypePlease')"
                 allow-clear
               />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item :label="t('views.logManage.alarm.status')" name="status">
+            <a-form-item
+              :label="t('views.logManage.alarm.status')"
+              name="status"
+            >
               <a-select
-                v-model:value="queryParams.status"
+                v-model:value="queryParams.alarmStatus"
+                :placeholder="t('common.selectPlease')"
                 allow-clear
                 :options="dict.alarmStatus"
               >
@@ -236,20 +323,23 @@ onMounted(() => {
             </a-form-item>
           </a-col>
           <a-col :lg="8" :md="12" :xs="24">
-            <a-form-item :label="t('views.logManage.alarm.logTime')" name="queryRangePicker">
+            <a-form-item
+              :label="t('views.logManage.alarm.logTime')"
+              name="queryRangePicker"
+            >
               <a-range-picker
                 v-model:value="queryRangePicker"
-                allow-clear
-                bordered
-                show-time
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
+                :presets="rangePickerPresets"
+                :bordered="true"
+                :allow-clear="false"
                 style="width: 100%"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
               ></a-range-picker>
             </a-form-item>
           </a-col>
 
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="4" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">
@@ -325,12 +415,24 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :pagination="tablePagination"
-        :scroll="{ x: true }"
+        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
       >
         <template #bodyCell="{ column, record }">
           <template v-if="column.key === 'alarmStatus'">
             <DictTag :options="dict.alarmStatus" :value="record.alarmStatus" />
           </template>
+          <template v-if="column.key === 'alarmType'">
+            <DictTag
+              :options="dict.activeAlarmType"
+              :value="record.alarmType"
+            />
+          </template>
+          <template v-if="column.key === 'origSeverity'">
+            <DictTag
+              :options="dict.activeAlarmSeverity"
+              :value="record.origSeverity"
+            />
+          </template>
         </template>
       </a-table>
     </a-card>
diff --git a/src/views/logManage/forwarding/index.vue b/src/views/logManage/forwarding/index.vue
index 3dfffbc6..58e02b2b 100644
--- a/src/views/logManage/forwarding/index.vue
+++ b/src/views/logManage/forwarding/index.vue
@@ -10,6 +10,7 @@ import { listForwarding } from '@/api/logManage/forwarding';
 import useNeInfoStore from '@/store/modules/neinfo';
 import useDictStore from '@/store/modules/dict';
 import useI18n from '@/hooks/useI18n';
+import dayjs, { type Dayjs } from 'dayjs';
 const { getDict } = useDictStore();
 const { t } = useI18n();
 
@@ -17,20 +18,44 @@ const { t } = useI18n();
 let dict: {
   /**告警状态 */
   alarmStatus: DictType[];
+  /**活动告警类型 */
+  activeAlarmType: DictType[];
+  /**原始严重程度 */
+  activeAlarmSeverity: DictType[];
 } = reactive({
   alarmStatus: [],
+  activeAlarmType: [],
+  activeAlarmSeverity: [],
 });
 
-/**记录开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+/**开始结束时间 */
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);
+/**时间范围 */
+let rangePickerPresets = ref([
+  {
+    label: 'Now hour',
+    value: [dayjs().startOf('hour'), dayjs().endOf('hour')],
+  },
+  { label: 'Today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+  {
+    label: 'Yesterday',
+    value: [
+      dayjs().subtract(1, 'day').startOf('day'),
+      dayjs().subtract(1, 'day').endOf('day'),
+    ],
+  },
+]);
 
 /**查询参数 */
 let queryParams = reactive({
   /**网元类型 */
   neType: '',
-  /**记录时间 */
-  beginTime: '',
-  endTime: '',
+  sortField: 'event_time',
+  sortOrder: 'desc',
+  /**开始时间 */
+  beginTime: undefined as undefined | number,
+  /**结束时间 */
+  endTime: undefined as undefined | number,
   /**当前页数 */
   pageNum: 1,
   /**每页条数 */
@@ -41,12 +66,12 @@ let queryParams = reactive({
 function fnQueryReset() {
   queryParams = Object.assign(queryParams, {
     neType: '',
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
     pageNum: 1,
     pageSize: 20,
   });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
   tablePagination.current = 1;
   tablePagination.pageSize = 20;
   fnGetList();
@@ -68,7 +93,7 @@ type TabeStateType = {
 let tableState: TabeStateType = reactive({
   loading: false,
   size: 'middle',
-  seached: true,
+  seached: false,
   data: [],
 });
 
@@ -77,77 +102,106 @@ let tableColumns: ColumnsType = reactive([
   {
     title: t('common.rowId'),
     dataIndex: 'id',
-    align: 'center',
-    width: 3,
+    align: 'left',
+    width: 100,
   },
   {
     title: t('views.logManage.forwarding.alarmInter'),
     dataIndex: 'type',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.logManage.forwarding.alarmObj'),
     dataIndex: 'target',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 150,
+    ellipsis: true,
   },
   {
     title: t('views.logManage.forwarding.alarmInfo'),
     dataIndex: 'result',
-    align: 'center',
-    width: 6,
+    align: 'left',
     ellipsis: true,
   },
   {
-    title: t('views.logManage.forwarding.type'),
+    title: t('views.ne.common.neType'),
     dataIndex: 'neType',
-    align: 'center',
-    width: 4,
+    align: 'left',
+    width: 100,
   },
   {
-    title: t('views.logManage.forwarding.neId'),
+    title: t('views.ne.common.neId'),
     dataIndex: 'neId',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 100,
   },
   {
     title: t('views.logManage.forwarding.alarmId'),
     dataIndex: 'alarmId',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 120,
   },
   {
     title: t('views.logManage.forwarding.alarmSeq'),
     dataIndex: 'alarmSeq',
-    align: 'center',
-    width: 4,
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.logManage.forwarding.alarmCode'),
+    dataIndex: 'alarmCode',
+    align: 'left',
+    width: 150,
+    ellipsis: true,
   },
   {
     title: t('views.logManage.forwarding.alarmTitle'),
     dataIndex: 'alarmTitle',
-    align: 'center',
-    width: 5,
+    align: 'left',
+    width: 200,
+    ellipsis: true,
+  },
+  {
+    title: t('views.logManage.forwarding.alarmStatus'),
+    dataIndex: 'alarmStatus',
+    key: 'alarmStatus',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.logManage.forwarding.alarmType'),
+    dataIndex: 'alarmType',
+    key: 'alarmType',
+    align: 'left',
+    width: 150,
+  },
+  {
+    title: t('views.logManage.forwarding.origSeverity'),
+    dataIndex: 'origSeverity',
+    key: 'origSeverity',
+    align: 'left',
+    width: 150,
   },
   {
     title: t('views.logManage.forwarding.eventTime'),
     dataIndex: 'eventTime',
-    align: 'center',
+    align: 'left',
     customRender(opt) {
       if (!opt.value) return '';
-      return parseDateToStr(opt.value);
+      return parseDateToStr(+opt.value);
     },
-    width: 5,
+    width: 150,
   },
   {
     title: t('views.logManage.forwarding.logTime'),
     dataIndex: 'createdAt',
-    align: 'center',
+    align: 'left',
     customRender(opt) {
       if (!opt.value) return '';
-      return parseDateToStr(opt.value);
+      return parseDateToStr(+opt.value);
     },
-    width: 5,
+    width: 150,
   },
 ]);
 
@@ -191,11 +245,19 @@ function fnGetList(pageNum?: number) {
   if (pageNum) {
     queryParams.pageNum = pageNum;
   }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
   }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
   listForwarding(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
       const { total, rows } = res.data;
@@ -216,15 +278,28 @@ function fnGetList(pageNum?: number) {
 
 onMounted(() => {
   // 初始字典数据
-  Promise.allSettled([getDict('alarm_status')]).then(resArr => {
+  Promise.allSettled([
+    getDict('alarm_status'),
+    getDict('active_alarm_type'),
+    getDict('active_alarm_severity'),
+  ]).then(resArr => {
     if (resArr[0].status === 'fulfilled') {
       dict.alarmStatus = resArr[0].value;
     }
+    if (resArr[1].status === 'fulfilled') {
+      dict.activeAlarmType = resArr[1].value;
+    }
+    if (resArr[2].status === 'fulfilled') {
+      dict.activeAlarmSeverity = resArr[2].value;
+    }
   });
   // 获取网元网元列表
-  useNeInfoStore().fnNelist();
-  // 获取列表数据
-  fnGetList();
+  useNeInfoStore()
+    .fnNelist()
+    .finally(() => {
+      // 获取列表数据
+      fnGetList();
+    });
 });
 </script>
 
@@ -238,14 +313,12 @@ onMounted(() => {
       <!-- 表格搜索栏 -->
       <a-form :model="queryParams" name="queryParams" layout="horizontal">
         <a-row :gutter="16">
-          <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.logManage.forwarding.type')"
-              name="neType"
-            >
+          <a-col :lg="4" :md="12" :xs="24">
+            <a-form-item :label="t('views.ne.common.neType')" name="neType">
               <a-auto-complete
                 v-model:value="queryParams.neType"
                 :options="useNeInfoStore().getNeSelectOtions"
+                :placeholder="t('views.ne.common.neTypePlease')"
                 allow-clear
               />
             </a-form-item>
@@ -257,17 +330,16 @@ onMounted(() => {
             >
               <a-range-picker
                 v-model:value="queryRangePicker"
-                allow-clear
-                bordered
-                show-time
-                value-format="YYYY-MM-DD HH:mm:ss"
-                format="YYYY-MM-DD HH:mm:ss"
+                :presets="rangePickerPresets"
+                :bordered="true"
+                :allow-clear="false"
                 style="width: 100%"
+                :show-time="{ format: 'HH:mm:ss' }"
+                format="YYYY-MM-DD HH:mm:ss"
               ></a-range-picker>
             </a-form-item>
           </a-col>
-
-          <a-col :lg="6" :md="12" :xs="24">
+          <a-col :lg="4" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
                 <a-button type="primary" @click.prevent="fnGetList(1)">
@@ -343,8 +415,25 @@ onMounted(() => {
         :data-source="tableState.data"
         :size="tableState.size"
         :pagination="tablePagination"
-        :scroll="{ x: 1500, y: 400 }"
+        :scroll="{ x: tableColumns.length * 150, y: 'calc(100vh - 480px)' }"
       >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'alarmStatus'">
+            <DictTag :options="dict.alarmStatus" :value="record.alarmStatus" />
+          </template>
+          <template v-if="column.key === 'alarmType'">
+            <DictTag
+              :options="dict.activeAlarmType"
+              :value="record.alarmType"
+            />
+          </template>
+          <template v-if="column.key === 'origSeverity'">
+            <DictTag
+              :options="dict.activeAlarmSeverity"
+              :value="record.origSeverity"
+            />
+          </template>
+        </template>
       </a-table>
     </a-card>
   </PageContainer>