diff --git a/src/apis/models/device/alarm/ndm-device-alarm-log.ts b/src/apis/models/device/alarm/ndm-device-alarm-log.ts index c9916fc..13b19c7 100644 --- a/src/apis/models/device/alarm/ndm-device-alarm-log.ts +++ b/src/apis/models/device/alarm/ndm-device-alarm-log.ts @@ -2,6 +2,7 @@ import type { BaseModel } from '../../base/model'; import type { ReduceForPageQuery, ReduceForSaveVO, ReduceForUpdateVO } from '../../base/reduce'; export interface NdmDeviceAlarmLogVO extends BaseModel { + [key: string]: any; // 告警数据表格中会加一些别的标记字段 alarmNo: string; alarmDate: string; faultLocation: string; diff --git a/src/apis/requests/log/ndm-device-alarm-log.ts b/src/apis/requests/log/ndm-device-alarm-log.ts index d2ba559..273347e 100644 --- a/src/apis/requests/log/ndm-device-alarm-log.ts +++ b/src/apis/requests/log/ndm-device-alarm-log.ts @@ -1,10 +1,24 @@ import type { PageParams, PageResult } from '@/apis/models/base/page'; import type { NdmDeviceAlarmLogPageQuery, NdmDeviceAlarmLogResultVO } from '@/apis/models/device/alarm/ndm-device-alarm-log'; -import { ndmClient } from '@/apis/client'; +import { ndmClient, userClient } from '@/apis/client'; export const postNdmDeviceAlarmLogPage = async (stationCode: string, pageQuery: PageParams) => { - const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmDeviceAlarmLog/page`, pageQuery); - return resp; + const endpoint = '/api/ndm/ndmDeviceAlarmLog/page'; + // 如果车站编码为空,则通过用户API客户端发送请求 + if (!stationCode) { + const resp = await userClient.post>(endpoint, pageQuery); + const [err, alarmData] = resp; + if (err || !alarmData) { + throw err; + } + return alarmData; + } + // 如果车站编码不为空,则通过网管API客户端发送请求 + const resp = await ndmClient.post>(`/${stationCode}${endpoint}`, pageQuery); + const [err, alarmData] = resp; + if (err || !alarmData) { + throw err; + } + return alarmData; }; diff --git a/src/components/device-alarm-detail-modal.vue b/src/components/device-alarm-detail-modal.vue new file mode 100644 index 0000000..89a23e0 --- /dev/null +++ b/src/components/device-alarm-detail-modal.vue @@ -0,0 +1,173 @@ +` + + + + + +` diff --git a/src/components/device-alarm-stat-modal.vue b/src/components/device-alarm-stat-modal.vue deleted file mode 100644 index 1017376..0000000 --- a/src/components/device-alarm-stat-modal.vue +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/src/components/offline-device-tree-modal.vue b/src/components/offline-device-detail-modal.vue similarity index 74% rename from src/components/offline-device-tree-modal.vue rename to src/components/offline-device-detail-modal.vue index 2c86dc1..a53aa8f 100644 --- a/src/components/offline-device-tree-modal.vue +++ b/src/components/offline-device-detail-modal.vue @@ -1,41 +1,23 @@