From 4f34b3bca91c9c8cd3aa31654c75508d4bd4710f Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Tue, 26 Dec 2023 11:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faultManage/active-alarm/index.vue  | 43 ++++--------------
 src/views/faultManage/history-alarm/index.vue | 44 ++++---------------
 2 files changed, 17 insertions(+), 70 deletions(-)

diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue
index 984f890f..b846d9f5 100644
--- a/src/views/faultManage/active-alarm/index.vue
+++ b/src/views/faultManage/active-alarm/index.vue
@@ -48,6 +48,7 @@ let tableColumnsDnd = ref<ColumnsType>([]);
 /**记录开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);
 
+
 /**查询参数 */
 let queryParams = reactive({
   /**告警设备类型 */
@@ -168,6 +169,7 @@ let tableColumns: ColumnsType = [
     title: t('views.faultManage.activeAlarm.origLevel'),
     align: 'center',
     key: 'origSeverity',
+    dataIndex:'origSeverity',
     width: 5,
   },
   {
@@ -623,48 +625,21 @@ function fnShowSet() {
 /**
  * 导出全部
  */
-function fnExportAll() {
+function fnExportAll() { 
   Modal.confirm({
     title: 'Tip',
     content: t('views.faultManage.activeAlarm.exportSure'),
     onOk() {
       const key = 'exportAlarm';
       message.loading({ content: t('common.loading'), key });
+      let sortArr:any=[];
+      tableColumnsDnd.value.forEach((item: any) => {
+        if(item.dataIndex) sortArr.push(item.dataIndex);
+      })
+
       // 排序字段
       const sortData = {
-        header: [
-          'id',
-          'neId',
-          'neName',
-          'neType',
-          'ackState',
-          'ackTime',
-          'ackUser',
-          'addInfo',
-          'alarmCode',
-          'alarmId',
-          'alarmSeq',
-          'alarmStatus',
-          'alarmTitle',
-          'alarmType',
-          'clearTime',
-          'clearType',
-          'clearUser',
-          'counter',
-          'eventTime',
-          'latestEventTime',
-          'locationInfo',
-          'objectName',
-          'objectType',
-          'objectUid',
-          'origSeverity',
-          'perceivedSeverity',
-          'province',
-          'pvFlag',
-          'specificProblem',
-          'specificProblemId',
-          'timestamp',
-        ],
+        header:sortArr,
       };
       exportAll(queryParams).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
diff --git a/src/views/faultManage/history-alarm/index.vue b/src/views/faultManage/history-alarm/index.vue
index 19609729..c05177d3 100644
--- a/src/views/faultManage/history-alarm/index.vue
+++ b/src/views/faultManage/history-alarm/index.vue
@@ -146,7 +146,7 @@ let tableColumns: ColumnsType = [
   {
     title: t('views.faultManage.activeAlarm.origLevel'),
     align: 'left',
-    dataIndex: 'origLevel',
+    dataIndex: 'origSeverity',
     key: 'origSeverity',
     width: 5,
   },
@@ -434,41 +434,13 @@ function fnExportAll() {
     onOk() {
       const key = 'exportAlarmHis';
       message.loading({ content: t('common.loading'), key });
-       // 排序字段
-       const sortData = {
-        header: [
-          'id',
-          'neId',
-          'neName',
-          'neType',
-          'ackState',
-          'ackTime',
-          'ackUser',
-          'addInfo',
-          'alarmCode',
-          'alarmId',
-          'alarmSeq',
-          'alarmStatus',
-          'alarmTitle',
-          'alarmType',
-          'clearTime',
-          'clearType',
-          'clearUser',
-          'counter',
-          'eventTime',
-          'latestEventTime',
-          'locationInfo',
-          'objectName',
-          'objectType',
-          'objectUid',
-          'origSeverity',
-          'perceivedSeverity',
-          'province',
-          'pvFlag',
-          'specificProblem',
-          'specificProblemId',
-          'timestamp',
-        ],
+      let sortArr:any=[];
+      tableColumnsDnd.value.forEach((item: any) => {
+        if(item.dataIndex) sortArr.push(item.dataIndex);
+      })
+      // 排序字段
+      const sortData = {
+        header:sortArr,
       };
       exportAll(queryParams).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {