diff --git a/src/api/faultManage/actAlarm.ts b/src/api/faultManage/actAlarm.ts index 210d9023..3b2743a4 100644 --- a/src/api/faultManage/actAlarm.ts +++ b/src/api/faultManage/actAlarm.ts @@ -12,7 +12,7 @@ export async function getActiveAlarmTotal() { url: `/neData/alarm/list`, method: 'GET', params: { - alarmStatus: '1', + alarmStatus: 'Active', sortField: 'event_time', sortOrder: 'desc', pageNum: 1, diff --git a/src/api/logManage/security.ts b/src/api/logManage/security.ts deleted file mode 100644 index 4a1448b2..00000000 --- a/src/api/logManage/security.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { RESULT_CODE_SUCCESS } from '@/constants/result-constants'; -import { request } from '@/plugins/http-fetch'; -import { parseObjLineToHump } from '@/utils/parse-utils'; - -/** - * 查询日志列表 - * @param query 查询参数 - * @returns object - */ -export async function listSecurityLog(query: Record) { - let totalSQL = 'select count(*) as total from security_log where 1=1 '; - let rowsSQL = 'select * from security_log where 1=1 '; - - // 查询 - let querySQL = ''; - if (query.accountName) { - querySQL += ` and account_name like '%${query.accountName}%' `; - } - if (query.opType) { - querySQL += ` and op_type = '${query.opType}' `; - } - if (query.beginTime) { - querySQL += ` and op_time >= '${query.beginTime}' `; - } - if (query.endTime) { - querySQL += ` and op_time <= '${query.endTime}' `; - } - - // 排序 - let sortSql = ' order by op_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/security_log`, - method: 'GET', - params: { - totalSQL: totalSQL + querySQL, - rowsSQL: rowsSQL + querySQL + sortSql + limtSql, - }, - }); - - // 解析数据 - 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['security_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/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue index bce1180d..7d9efbd9 100644 --- a/src/views/faultManage/active-alarm/index.vue +++ b/src/views/faultManage/active-alarm/index.vue @@ -70,7 +70,7 @@ let rangePickerPresets = ref([ /**查询参数 */ let queryParams = reactive({ - alarmStatus: 1, + alarmStatus: 'Active', sortField: 'event_time', sortOrder: 'desc', /**告警设备类型 */ @@ -102,7 +102,7 @@ let queryParams = reactive({ /**查询参数重置 */ function fnQueryReset() { queryParams = Object.assign(queryParams, { - alarmStatus: 1, + alarmStatus: 'Active', /**告警设备类型 */ neType: '', /**告警网元名称 */ @@ -386,7 +386,7 @@ let modalState: ModalStateType = reactive({ objectName: '', locationInfo: '', province: '', - alarmStatus: '', + alarmStatus: 'Active', specificProblemId: '', specificProblem: '', addInfo: '', diff --git a/src/views/faultManage/history-alarm/index.vue b/src/views/faultManage/history-alarm/index.vue index 3c085bb5..7833ac68 100644 --- a/src/views/faultManage/history-alarm/index.vue +++ b/src/views/faultManage/history-alarm/index.vue @@ -61,7 +61,7 @@ let rangePickerPresets = ref([ /**查询参数 */ let queryParams = reactive({ - alarmStatus: 0, + alarmStatus: 'Clear', sortField: 'event_time', sortOrder: 'desc', /**告警设备类型 */ @@ -91,7 +91,7 @@ let queryParams = reactive({ /**查询参数重置 */ function fnQueryReset() { queryParams = Object.assign(queryParams, { - alarmStatus: 0, + alarmStatus: 'Clear', /**告警设备类型 */ neType: '', /**告警网元名称 */ @@ -317,7 +317,7 @@ let modalState: ModalStateType = reactive({ objectName: '', locationInfo: '', province: '', - alarmStatus: '', + alarmStatus: 'Clear', specificProblemId: '', specificProblem: '', addInfo: '',