--修正活动历史告警的代码规范

src/api/faultManage/actAlarm.ts

@@ -4,7 +4,6 @@ import { toRaw } from 'vue';
 import { parseObjLineToHump } from '@/utils/parse-utils';
 import { parseDateToStr } from '@/utils/date-utils';
 import useUserStore from '@/store/modules/user';
-import { ConsoleSqlOutlined } from '@ant-design/icons-vue';
 
 /**
  * 查询列表
@@ -16,23 +15,38 @@ export async function listAct(query: Record<string, any>, filterSQl: string) {
   let rowsSQL = `select * from alarm where alarm_status='1' ${filterSQl}`;
   // 查询
   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}'`
-      : '';
+
+  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;
@@ -239,7 +253,6 @@ export async function exportAll(query: Record<string, any>) {
     },
   });
 
-
   if (result.code === RESULT_CODE_SUCCESS) {
     let v = result.data.data[0];
     const vArr = parseObjLineToHump(v['alarm']);