diff --git a/package.json b/package.json
index 12ee3958..f84a6c7b 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,8 @@
     "vue": "^3.3.4",
     "vue-codemirror": "^6.1.1",
     "vue-i18n": "^9.3.0",
-    "vue-router": "^4.2.4"
+    "vue-router": "^4.2.4",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@types/file-saver": "^2.0.5",
diff --git a/public/alarmHelp/20001.xlsx b/public/alarmHelp/20001.xlsx
new file mode 100644
index 00000000..2daef158
Binary files /dev/null and b/public/alarmHelp/20001.xlsx differ
diff --git a/public/alarmHelp/20002.xlsx b/public/alarmHelp/20002.xlsx
new file mode 100644
index 00000000..8f5ff659
Binary files /dev/null and b/public/alarmHelp/20002.xlsx differ
diff --git a/public/alarmHelp/20003.xlsx b/public/alarmHelp/20003.xlsx
new file mode 100644
index 00000000..e0e69404
Binary files /dev/null and b/public/alarmHelp/20003.xlsx differ
diff --git a/public/alarmHelp/20004.xlsx b/public/alarmHelp/20004.xlsx
new file mode 100644
index 00000000..5ee567ff
Binary files /dev/null and b/public/alarmHelp/20004.xlsx differ
diff --git a/public/alarmHelp/20005.xlsx b/public/alarmHelp/20005.xlsx
new file mode 100644
index 00000000..cdbaf1e3
Binary files /dev/null and b/public/alarmHelp/20005.xlsx differ
diff --git a/public/alarmHelp/30001.xlsx b/public/alarmHelp/30001.xlsx
new file mode 100644
index 00000000..f52b8573
Binary files /dev/null and b/public/alarmHelp/30001.xlsx differ
diff --git a/public/alarmHelp/30002.xlsx b/public/alarmHelp/30002.xlsx
new file mode 100644
index 00000000..e7d9b767
Binary files /dev/null and b/public/alarmHelp/30002.xlsx differ
diff --git a/public/alarmHelp/30003.xlsx b/public/alarmHelp/30003.xlsx
new file mode 100644
index 00000000..9232febf
Binary files /dev/null and b/public/alarmHelp/30003.xlsx differ
diff --git a/public/alarmHelp/30004.xlsx b/public/alarmHelp/30004.xlsx
new file mode 100644
index 00000000..638a2513
Binary files /dev/null and b/public/alarmHelp/30004.xlsx differ
diff --git a/public/alarmHelp/30005.xlsx b/public/alarmHelp/30005.xlsx
new file mode 100644
index 00000000..cf01aa11
Binary files /dev/null and b/public/alarmHelp/30005.xlsx differ
diff --git a/public/alarmHelp/30006.xlsx b/public/alarmHelp/30006.xlsx
new file mode 100644
index 00000000..e3a1e35d
Binary files /dev/null and b/public/alarmHelp/30006.xlsx differ
diff --git a/public/alarmHelp/30007.xlsx b/public/alarmHelp/30007.xlsx
new file mode 100644
index 00000000..3b001832
Binary files /dev/null and b/public/alarmHelp/30007.xlsx differ
diff --git a/public/alarmHelp/30008.xlsx b/public/alarmHelp/30008.xlsx
new file mode 100644
index 00000000..b58edb07
Binary files /dev/null and b/public/alarmHelp/30008.xlsx differ
diff --git a/public/alarmHelp/40001.xlsx b/public/alarmHelp/40001.xlsx
new file mode 100644
index 00000000..b4b176ee
Binary files /dev/null and b/public/alarmHelp/40001.xlsx differ
diff --git a/public/alarmHelp/40002.xlsx b/public/alarmHelp/40002.xlsx
new file mode 100644
index 00000000..481b7126
Binary files /dev/null and b/public/alarmHelp/40002.xlsx differ
diff --git a/src/api/faultManage/actAlarm.ts b/src/api/faultManage/actAlarm.ts
new file mode 100644
index 00000000..1b2c3197
--- /dev/null
+++ b/src/api/faultManage/actAlarm.ts
@@ -0,0 +1,75 @@
+import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { request } from '@/plugins/http-fetch';
+import { parseObjLineToHump } from '@/utils/parse-utils';
+import { toRaw } from '@vue/reactivity';
+
+/**
+ * 查询列表
+ * @param query 查询参数
+ * @returns object
+ */
+export async function listAct(query: Record<string, any>) {
+  let filterData = '';
+  let totalSQL = `select count(*)  as total from alarm where alarm_status='1' ${filterData} `;
+  let rowsSQL = `select * from alarm where alarm_status='1' ${filterData}`;
+
+  // 查询
+  let querySQL = '';
+  if (query.alarm_code) {
+    querySQL += ` and alarm_code = '${query.alarm_code}' `;
+  }
+  if (query.alarm_type) {
+    querySQL += ` and alarm_type = ${query.alarm_type} `;
+  }
+  if (query.pv_flag) {
+    querySQL += ` and pv_flag = ${query.pv_flag} `;
+  }
+  if (query.orig_severity) {
+    querySQL += ` and orig_severity in (${query.orig_severity} )`;
+  }
+  if (query.ne_id) {
+    querySQL += ` and ne_id like '%${query.ne_id}%' `;
+  }
+  if (query.ne_name) {
+    querySQL += ` and ne_name like '%${query.ne_name}%' `;
+  }
+  if (query.ne_type) {
+    querySQL += ` and ne_type like '%${query.ne_type}%' `;
+  }
+
+  // 分页
+  const pageNum = (query.pageNum - 1) * query.pageSize;
+  const limtSql = ` order by event_time desc limit ${pageNum},${query.pageSize} `;
+
+  // 发起请求
+  const result = await request({
+    url: `/databaseManagement/v1/select/omc_db/alarm`,
+    method: 'get',
+    params: {
+      SQL: totalSQL + querySQL,
+      rowsSQL: rowsSQL + querySQL + limtSql,
+    },
+  });
+
+  // 解析数据
+  if (result.code === RESULT_CODE_SUCCESS) {
+    const data: DataList = {
+      total: 0,
+      rows: [],
+      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']) {
+          data.total = itemData[0]['total'];
+        } else {
+          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 f93a11c7..bf1bc735 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -246,8 +246,9 @@ export default {
         delTaskTip: 'Are you sure to delete the data item with record number {num}?',
       },
     },
-    alarm: {
-      alarmAct: {
+    faultManage: {
+      activeAlarm: {
+        all:'All',
         neType: 'Alarm device type',
         neName: 'Alarm network element name',
         neId: 'Alarm network element identification',
@@ -263,6 +264,22 @@ export default {
         exportAll: 'Export All',
         disPlayFilfter: 'Display Filters',
         autoConfirm: 'Automatic confirmation of configuration',
+        critical:'Critical',
+        major:'Major',
+        minor:'Minor',
+        warning:'Warning',
+        eventAlarm:'Event',
+        communicationAlarm:'CommunicationAlarm',
+        equipmentAlarm:'EquipmentAlarm',
+        processingFailure:'ProcessingFailure',
+        environmentalAlarm:'EnvironmentalAlarm',
+        qualityOfServiceAlarm:'QualityOfServiceAlarm',
+        alarmId:'alarm ID',
+        alarmTitle:'alarm Title',
+        clearUser:'clear User',
+        clearType:'clear Type',
+        ackState:'Alarm confirmation status',
+        ackUser:'Alarm confirmation user'
       },
     },
     monitor: {
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 1331d47c..b6f4c5da 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -246,8 +246,9 @@ export default {
         delTaskTip: '纭鍒犻櫎璁板綍缂栧彿涓� {num} 鐨勬暟鎹」?',
       },
     },
-    alarm: {
-      alarmAct: {
+    faultManage: {
+      activeAlarm: { 
+        all:'鎵�鏈�',
         neType: '鍛婅璁惧绫诲瀷',
         neName: '鍛婅缃戝厓鍚嶇О',
         neId: '鍛婅缃戝厓鏍囪瘑',
@@ -263,6 +264,22 @@ export default {
         exportAll: '瀵煎嚭鍏ㄩ儴',
         disPlayFilfter: '鏄剧ず杩囨护',
         autoConfirm: '鑷姩纭閰嶇疆',
+        critical:'涓ラ噸鍛婅',
+        major:'涓昏鍛婅',
+        minor:'娆¤鍛婅',
+        warning:'璀﹀憡鍛婅',
+        eventAlarm:'浜嬩欢鍛婅',
+        communicationAlarm:'閫氫俊鍛婅',
+        equipmentAlarm:'璁惧鍛婅',
+        processingFailure:'澶勭悊閿欒鍛婅',
+        environmentalAlarm:'鐜鍛婅',
+        qualityOfServiceAlarm:'鏈嶅姟璐ㄩ噺鍛婅',
+        alarmId:'鍛婅鍞竴鏍囪瘑',
+        alarmTitle:'鍛婅鍚嶇О',
+        clearUser:'鍛婅娓呴櫎鐢ㄦ埛',
+        clearType:'鍛婅娓呴櫎绫诲瀷',
+        ackState:'鍛婅纭鐘舵��',
+        ackUser:'鍛婅纭鐢ㄦ埛'
       },
     },
     monitor: {
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index c10a97dd..0ba26a19 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -27,6 +27,8 @@ type UserInfo = {
   email: string;
   /**鐢ㄦ埛鎬у埆 */
   sex: string | undefined;
+  /**涓汉鍖栬缃� */
+  profile: Record<string, any>;
 };
 
 /**
@@ -56,6 +58,7 @@ const useUserStore = defineStore('user', {
     phonenumber: '',
     email: '',
     sex: undefined,
+    profile: {},
   }),
   getters: {
     /**
@@ -129,6 +132,19 @@ const useUserStore = defineStore('user', {
         this.phonenumber = user.phone;
         this.email = user.email;
         this.sex = user.gender;
+       // this.profile = JSON.parse(user.profile);
+        try {
+          this.profile = JSON.parse(user.profile);
+        } catch (error) {
+          console.log(error);
+          this.profile = {
+            critical: '#FF5722',
+            major: '#FFB800',
+            minor: '#393D49',
+            warning: '#009688',
+            event: '#1E9FFF',
+          };
+        }
 
         // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
         if (Array.isArray(roles) && roles.length > 0) {
diff --git a/src/utils/execl-utils.ts b/src/utils/execl-utils.ts
new file mode 100644
index 00000000..ab735e12
--- /dev/null
+++ b/src/utils/execl-utils.ts
@@ -0,0 +1,30 @@
+import { read, utils } from 'xlsx';
+
+/**
+ * 字体图标文件-静态资源文件路径
+ */
+const baseUrl = import.meta.env.VITE_HISTORY_BASE_URL;
+export const scriptUrl = `${
+  baseUrl.length === 1 && baseUrl.indexOf('/') === 0
+    ? ''
+    : baseUrl.indexOf('/') === -1
+    ? '/' + baseUrl
+    : baseUrl
+}/alarmHelp`;
+
+
+
+/**
+ * 格式时间字符串
+ * @param dateStr 时间字符串
+ * @param formatStr 时间格式 默认YYYY-MM-DD HH:mm:ss
+ * @returns Date对象
+ */
+export async function parseStrToDate():  Promise<Record<string, any>[]> {
+
+      const f = await (await fetch(scriptUrl+"/20001.xlsx")).arrayBuffer();
+      const wb = read(f);1
+      const data = utils.sheet_to_json< Record<string, any>>(wb.Sheets[wb.SheetNames[0]]);
+      console.log(data);
+    return data;
+  }
\ No newline at end of file
diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue
index 5c9c8794..d3f3151c 100644
--- a/src/views/faultManage/active-alarm/index.vue
+++ b/src/views/faultManage/active-alarm/index.vue
@@ -1,15 +1,18 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router';
+import dayjs, { Dayjs } from 'dayjs';
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from '@ant-design-vue/pro-layout';
 import { message } from 'ant-design-vue/lib';
 import { SizeType } from 'ant-design-vue/lib/config-provider';
 import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
 import { ColumnsType } from 'ant-design-vue/lib/table';
-import { listUE } from '@/api/neUser/ue';
+import useUserStore from '@/store/modules/user';
+import { listAct } from '@/api/faultManage/actAlarm';
 import useNeInfoStore from '@/store/modules/neinfo';
 import useI18n from '@/hooks/useI18n';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
+import { parseStrToDate } from '@/utils/execl-utils';
 const { t } = useI18n();
 const route = useRoute();
 
@@ -21,12 +24,22 @@ let neOtions = ref<Record<string, any>[]>([]);
 
 /**鏌ヨ鍙傛暟 */
 let queryParams = reactive({
-  /**缃戝厓ID */
-  neId: undefined,
-  /**IMSI */
-  imsi: '',
-  /**msisdn */
-  msisdn: '',
+  /**鍛婅璁惧绫诲瀷 */
+  ne_type: '',
+  /**鍛婅缃戝厓鍚嶇О */
+  ne_name: '',
+  /**鍛婅缃戝厓鏍囪瘑 */
+  ne_id: '',
+  /**鍛婅缂栧彿 */
+  alarm_code: '',
+  /**鍛婅绾у埆 */
+  orig_severity: "'Critical','Major','Minor','Warning','Event'",
+  /**鍛婅浜х敓鏃堕棿 */
+  eventTime: '',
+  /**铏氭嫙鍖栨爣璇� */
+  pv_flag: '',
+  /**鍛婅绫诲瀷 */
+  alarm_type: '',
   /**褰撳墠椤垫暟 */
   pageNum: 1,
   /**姣忛〉鏉℃暟 */
@@ -72,54 +85,104 @@ let tableState: TabeStateType = reactive({
 /**琛ㄦ牸瀛楁鍒� */
 let tableColumns: ColumnsType = [
   {
-    title: 'IMSI',
-    dataIndex: 'imsi',
+    title: t('views.faultManage.activeAlarm.alarmId'),
+    dataIndex: 'alarmId',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.neId'),
+    dataIndex: 'neId',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.neName'),
+    dataIndex: 'neName',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.neType'),
+    dataIndex: 'neType',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.origLevel'),
+    dataIndex: 'origSeverity',
     align: 'center',
     customRender(opt) {
-      const idx = opt.value.lastIndexOf('-');
-      if (idx != -1) {
-        return opt.value.substring(idx + 1);
+      let levelName: any = {
+        Critical: '涓ラ噸鍛婅',
+        Major: '涓昏鍛婅',
+        Minor: '娆¤鍛婅',
+        Warning: '璀﹀憡鍛婅',
+        Event: '浜嬩欢鍛婅',
+      };
+      if (levelName[opt.value]) {
+        return levelName[opt.value];
       }
       return opt.value;
     },
   },
   {
-    title: 'MSISDN',
-    dataIndex: 'msisdn',
+    title: t('views.faultManage.activeAlarm.alarmCode'),
+    dataIndex: 'alarmCode',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.alarmTitle'),
+    dataIndex: 'alarmTitle',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.eventTime'),
+    dataIndex: 'eventTime',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.alarmType'),
+    dataIndex: 'alarmType',
     align: 'center',
     customRender(opt) {
-      const idx = opt.value.lastIndexOf('-');
-      if (idx != -1) {
-        return opt.value.substring(idx + 1);
+      let levelName: any = {
+        CommunicationAlarm: '閫氫俊鍛婅',
+        EquipmentAlarm: '璁惧鍛婅',
+        ProcessingFailure: '澶勭悊閿欒鍛婅',
+        EnvironmentalAlarm: '鐜鍛婅',
+        QualityOfServiceAlarm: '鏈嶅姟璐ㄩ噺鍛婅',
+      };
+      if (levelName[opt.value]) {
+        return levelName[opt.value];
       }
       return opt.value;
     },
   },
   {
-    title: 'RatType',
-    dataIndex: 'ratType',
+    title: t('views.faultManage.activeAlarm.pvFlag'),
+    dataIndex: 'alarm_id',
     align: 'center',
   },
   {
-    title: 'DnnList',
-    dataIndex: 'pduSessionInfo',
+    title: t('views.faultManage.activeAlarm.clearUser'),
+    dataIndex: 'clearUser',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.clearType'),
+    dataIndex: 'clearType',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.ackState'),
+    dataIndex: 'ackState',
+    align: 'center',
+  },
+  {
+    title: t('views.faultManage.activeAlarm.ackUser'),
+    dataIndex: 'ackUser',
     align: 'center',
-    customRender(opt) {
-      if (opt.value) {
-        let arr = [];
-        for (const v of opt.value) {
-          if (v.dnn) {
-            arr.push(v.dnn);
-          }
-        }
-        return arr.sort().join(',');
-      }
-      return '';
-    },
   },
   {
     title: t('common.operate'),
-    key: 'imsi',
+    key: 'alarm_id',
     align: 'center',
   },
 ];
@@ -157,6 +220,47 @@ function fnTableSize({ key }: MenuInfo) {
   tableState.size = key as SizeType;
 }
 
+/**琛ㄦ牸鎵�闇�option */
+const actAlarmOption = reactive({
+  pvFlag: [
+    { label: 'PNF', value: "'PNF'" },
+    { label: 'VNF', value: "'VNF'" },
+  ],
+  alarmType: [
+    {
+      label: t('views.faultManage.activeAlarm.communicationAlarm'),
+      value: "'CommunicationAlarm'",
+    },
+    {
+      label: t('views.faultManage.activeAlarm.equipmentAlarm'),
+      value: "'EquipmentAlarm'",
+    },
+    {
+      label: t('views.faultManage.activeAlarm.processingFailure'),
+      value: "'ProcessingFailure'",
+    },
+    {
+      label: t('views.faultManage.activeAlarm.environmentalAlarm'),
+      value: "'EnvironmentalAlarm'",
+    },
+    {
+      label: t('views.faultManage.activeAlarm.qualityOfServiceAlarm'),
+      value: "'QualityOfServiceAlarm'",
+    },
+  ],
+  origSeverity: [
+    {
+      label: t('views.faultManage.activeAlarm.all'),
+      value: "'Critical','Major','Minor','Warning','Event'",
+    },
+    { label: t('views.faultManage.activeAlarm.critical'), value: "'Critical'" },
+    { label: t('views.faultManage.activeAlarm.major'), value: "'Major'" },
+    { label: t('views.faultManage.activeAlarm.minor'), value: "'Minor'" },
+    { label: t('views.faultManage.activeAlarm.warning'), value: "'Warning'" },
+    { label: t('views.faultManage.activeAlarm.eventAlarm'), value: "'Event'" },
+  ],
+});
+
 /**瀵硅瘽妗嗗璞′俊鎭姸鎬佺被鍨� */
 type ModalStateType = {
   /**璇︽儏妗嗘槸鍚︽樉绀� */
@@ -175,12 +279,31 @@ type ModalStateType = {
 let modalState: ModalStateType = reactive({
   visibleByView: false,
   visibleByEdit: false,
-  title: '鍦ㄧ嚎淇℃伅',
+  title: '鍏ㄩ儴淇℃伅',
   from: {
-    imsi: '',
-    msisdn: '',
-    pduSessionInfo: undefined,
-    ratType: '',
+    alarmId: '',
+    alarmSeq: '',
+    neId:'',
+    neName: '',
+    neType: '',
+    alarmCode: '',
+    alarmTitle: '',
+    eventTime: '',
+    alarmType: '',
+    pvFlag: '',
+    objectName: '',
+    locationInfo: '',
+    province: '',
+    alarmStatus: '',
+    specificProblemId: '',
+    specificProblem: '',
+    addInfo: '',
+    clearType: '',
+    clearTime: '',
+    ackState: '',
+    ackUser: '',
+    ackTime: '',
+    origSeverity: '',
   },
   confirmLoading: false,
 });
@@ -190,10 +313,9 @@ let modalState: ModalStateType = reactive({
  * @param row 鍗曡璁板綍淇℃伅
  */
 function fnModalVisibleByVive(row: Record<string, any>) {
-  if (!row.imsi) {
-    message.error(`璁板綍淇℃伅瀛樺湪閿欒`, 2);
-    return;
-  }
+
+  console.log(toRaw(row))
+  return false;
   const imsiIdx = row.imsi.lastIndexOf('-');
   if (imsiIdx != -1) {
     row.imsi = row.imsi.substring(imsiIdx + 1);
@@ -206,6 +328,11 @@ function fnModalVisibleByVive(row: Record<string, any>) {
   modalState.title = `${row.imsi} 璁板綍淇℃伅`;
   modalState.visibleByView = true;
 }
+function fnModalVisibleBy() {
+  parseStrToDate();
+
+}
+
 
 /**
  * 瀵硅瘽妗嗗脊鍑哄叧闂墽琛屽嚱鏁�
@@ -220,7 +347,7 @@ function fnModalCancel() {
 function fnGetList() {
   if (tableState.loading) return;
   tableState.loading = true;
-  listUE(toRaw(queryParams)).then(res => {
+  listAct(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
       // 鍙栨秷鍕鹃��
       if (tableState.selectedRowKeys.length > 0) {
@@ -236,8 +363,10 @@ function fnGetList() {
   });
 }
 
+const profile = useUserStore().profile;
+
 onMounted(() => {
- 
+  fnGetList();
 });
 </script>
 
@@ -249,7 +378,7 @@ onMounted(() => {
       :body-style="{ marginBottom: '24px', paddingBottom: 0 }"
     >
       <!-- 琛ㄦ牸鎼滅储鏍� -->
-      <a-form :model="queryParams" name="queryParams" layout="horizontal"  >
+      <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.neUser.ue.neType')" name="neId ">
@@ -259,34 +388,42 @@ onMounted(() => {
                 :placeholder="t('views.neUser.ue.neTypePlease')"
               />
             </a-form-item> -->
-            <a-form-item :label="t('views.neUser.ue.neTypePlease')" name="imsi">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.neType')"
+              name="ne_type"
+            >
               <a-input
-                v-model:value="queryParams.imsi"
+                v-model:value="queryParams.ne_type"
                 allow-clear
-                placeholder="鏌ヨIMSI"
+                placeholder="鏌ヨ鍛婅璁惧绫诲瀷"
               ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="IMSI" name="imsi">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.neName')"
+              name="ne_name"
+            >
               <a-input
-                v-model:value="queryParams.imsi"
+                v-model:value="queryParams.ne_name"
                 allow-clear
-                placeholder="鏌ヨIMSI"
+                placeholder="鏌ヨ鍛婅缃戝厓鍚嶇О"
               ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="MSISDN" name="msisdn">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.neId')"
+              name="ne_id"
+            >
               <a-input
-                v-model:value="queryParams.msisdn"
+                v-model:value="queryParams.ne_id"
                 allow-clear
-                placeholder="鏌ヨMSISDN"
+                placeholder="鏌ヨ鍛婅缃戝厓鏍囪瘑"
               ></a-input>
             </a-form-item>
           </a-col>
-    
-     
+
           <a-col :lg="6" :md="12" :xs="24">
             <a-form-item>
               <a-space :size="8">
@@ -304,50 +441,67 @@ onMounted(() => {
         </a-row>
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="MSISDN" name="msisdn">
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.alarmCode')"
+              name="alarm_code"
+            >
               <a-input
-                v-model:value="queryParams.msisdn"
+                v-model:value="queryParams.alarm_code"
                 allow-clear
-                placeholder="鏌ヨMSISDN"
+                placeholder="鏌ヨ鍛婅缂栧彿"
               ></a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="MSISDN" name="msisdn">
-              <a-input
-                v-model:value="queryParams.msisdn"
-                allow-clear
-                placeholder="鏌ヨMSISDN"
-              ></a-input>
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.origLevel')"
+              name="orig_severity"
+            >
+              <a-select
+                v-model:value="queryParams.orig_severity"
+                placeholder="Select alarm Type"
+                show-search
+                :options="actAlarmOption.origSeverity"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="MSISDN" name="msisdn">
-              <a-input
-                v-model:value="queryParams.msisdn"
-                allow-clear
-                placeholder="鏌ヨMSISDN"
-              ></a-input>
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.eventTime')"
+              name="eventTime"
+            >
+              <a-range-picker show-time style="width: 400px" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="16">
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="MSISDN" name="msisdn">
-              <a-input
-                v-model:value="queryParams.msisdn"
-                allow-clear
-                placeholder="鏌ヨMSISDN"
-              ></a-input>
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.pvFlag')"
+              name="pv_flag"
+            >
+              <a-select
+                v-model:value="queryParams.pv_flag"
+                placeholder="Select a person"
+                show-search
+                :options="actAlarmOption.pvFlag"
+              />
+              <!-- <a-select-option value="'PNF'">PNF</a-select-option>
+                <a-select-option value="'VNF'">VNF</a-select-option>
+              </a-select> -->
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :xs="24">
-            <a-form-item label="MSISDN" name="msisdn">
-              <a-input
-                v-model:value="queryParams.msisdn"
-                allow-clear
-                placeholder="鏌ヨMSISDN"
-              ></a-input>
+            <a-form-item
+              :label="t('views.faultManage.activeAlarm.alarmType')"
+              name="alarm_type"
+            >
+              <a-select
+                v-model:value="queryParams.alarm_type"
+                placeholder="Select alarm Type"
+                show-search
+                :options="actAlarmOption.alarmType"
+              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -415,7 +569,7 @@ onMounted(() => {
         :scroll="{ x: true }"
       >
         <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'imsi'">
+          <template v-if="column.key === 'alarm_id'">
             <a-space :size="8" align="center">
               <a-tooltip>
                 <template #title>鏌ョ湅璇︽儏</template>
@@ -423,7 +577,16 @@ onMounted(() => {
                   type="link"
                   @click.prevent="fnModalVisibleByVive(record)"
                 >
-                  <template #icon><ProfileOutlined /></template>
+                  <template #icon><InfoCircleOutlined /></template>
+                </a-button>
+              </a-tooltip>
+              <a-tooltip>
+                <template #title>甯姪鏂囨。</template>
+                <a-button
+                  type="link"
+                  @click.prevent="fnModalVisibleBy()"
+                >
+                  <template #icon><QuestionCircleOutlined style="color:crimson;"/></template>
                 </a-button>
               </a-tooltip>
             </a-space>
diff --git a/src/views/neUser/auth/index.vue b/src/views/neUser/auth/index.vue
index aeea8fa4..6eba2075 100644
--- a/src/views/neUser/auth/index.vue
+++ b/src/views/neUser/auth/index.vue
@@ -381,7 +381,7 @@ function fnBatchModalOk() {
  * 瀵硅瘽妗嗗脊鍑� 鎵归噺鍒犻櫎纭鎵ц鍑芥暟
  * 杩涜琛ㄨ揪瑙勫垯鏍￠獙
  */
- function fnBatchDelModalOk() {
+function fnBatchDelModalOk() {
   modalStateBatchDelFrom
     .validate()
     .then(e => {
@@ -434,7 +434,7 @@ function fnBatchModalCancel() {
  * 鎵归噺鍒犻櫎瀵硅瘽妗嗗脊鍑哄叧闂墽琛屽嚱鏁�
  * 杩涜琛ㄨ揪瑙勫垯鏍￠獙
  */
- function fnBatchDelModalCancel() {
+function fnBatchDelModalCancel() {
   modalState.visibleByBatchDel = false;
   modalState.visibleByView = false;
   modalStateBatchDelFrom.resetFields();
@@ -859,7 +859,6 @@ onMounted(() => {
       >
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
-            {{ modalState.from }}
             <a-form-item
               label="IMSI"
               name="imsi"
@@ -1058,9 +1057,8 @@ onMounted(() => {
       </a-form>
     </a-modal>
 
-    
-        <!-- 鎵归噺鍒犻櫎妗� -->
-        <a-modal
+    <!-- 鎵归噺鍒犻櫎妗� -->
+    <a-modal
       width="1000px"
       :keyboard="false"
       :mask-closable="false"
@@ -1090,7 +1088,7 @@ onMounted(() => {
               ></a-input>
             </a-form-item>
           </a-col>
-    
+
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.neUser.sub.startIMSI')"
@@ -1115,8 +1113,7 @@ onMounted(() => {
               </a-input>
             </a-form-item>
           </a-col>
-          </a-row>
-
+        </a-row>
       </a-form>
     </a-modal>