diff --git a/src/apis/requests/device/log/ndm-device-alarm-log.ts b/src/apis/requests/device/log/ndm-device-alarm-log.ts index d2d12d3..cb18450 100644 --- a/src/apis/requests/device/log/ndm-device-alarm-log.ts +++ b/src/apis/requests/device/log/ndm-device-alarm-log.ts @@ -1,11 +1,11 @@ import { userClient, ndmClient } from '@/apis/client'; import type { PageParams, NdmDeviceAlarmLogPageQuery, PageResult, NdmDeviceAlarmLogResultVO } from '@/apis/models'; -export const postNdmDeviceAlarmLogPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmDeviceAlarmLogPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const endpoint = '/api/ndm/ndmDeviceAlarmLog/page'; // 如果车站编码为空,则通过用户API客户端发送请求 if (!stationCode) { - const resp = await userClient.post>(endpoint, pageQuery); + const resp = await userClient.post>(endpoint, pageQuery, { signal }); const [err, alarmData] = resp; if (err || !alarmData) { throw err; @@ -13,7 +13,7 @@ export const postNdmDeviceAlarmLogPage = async (stationCode: string, pageQuery: return alarmData; } // 如果车站编码不为空,则通过网管API客户端发送请求 - const resp = await ndmClient.post>(`/${stationCode}${endpoint}`, pageQuery); + const resp = await ndmClient.post>(`/${stationCode}${endpoint}`, pageQuery, { signal }); const [err, alarmData] = resp; if (err || !alarmData) { throw err; diff --git a/src/apis/requests/device/other/ndm-security-box.ts b/src/apis/requests/device/other/ndm-security-box.ts index 13aac42..2dfd452 100644 --- a/src/apis/requests/device/other/ndm-security-box.ts +++ b/src/apis/requests/device/other/ndm-security-box.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmSecurityBoxPageQuery, PageResult, NdmSecurityBoxResultVO, NdmSecurityBoxUpdateVO } from '@/apis/models'; -export const postNdmSecurityBoxPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmSecurityBoxPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSecurityBox/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSecurityBox/page`, pageQuery, { signal }); const [err, ndmSecurityBoxData] = resp; if (err || !ndmSecurityBoxData) { throw err; diff --git a/src/apis/requests/device/other/ndm-switch.ts b/src/apis/requests/device/other/ndm-switch.ts index 9c5f1bb..e6fb689 100644 --- a/src/apis/requests/device/other/ndm-switch.ts +++ b/src/apis/requests/device/other/ndm-switch.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmSwitchPageQuery, PageResult, NdmSwitchResultVO, NdmSwitchUpdateVO } from '@/apis/models'; -export const postNdmSwitchPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmSwitchPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSwitch/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmSwitch/page`, pageQuery, { signal }); const [err, ndmSwitchData] = resp; if (err || !ndmSwitchData) { throw err; diff --git a/src/apis/requests/device/storage/ndm-nvr.ts b/src/apis/requests/device/storage/ndm-nvr.ts index 2ad73e6..58e69ab 100644 --- a/src/apis/requests/device/storage/ndm-nvr.ts +++ b/src/apis/requests/device/storage/ndm-nvr.ts @@ -2,9 +2,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmNvrPageQuery, PageResult, NdmNvrResultVO, NdmNvrUpdateVO, NdmNvrVO, ClientChannel, NdmRecordCheck } from '@/apis/models'; import dayjs from 'dayjs'; -export const postNdmNvrPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmNvrPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmNvr/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmNvr/page`, pageQuery, { signal }); const [err, ndmNvrData] = resp; if (err || !ndmNvrData) { throw err; diff --git a/src/apis/requests/device/video/ndm-camera.ts b/src/apis/requests/device/video/ndm-camera.ts index acd8435..46d3e3f 100644 --- a/src/apis/requests/device/video/ndm-camera.ts +++ b/src/apis/requests/device/video/ndm-camera.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmCameraPageQuery, PageResult, NdmCameraResultVO, NdmCameraUpdateVO } from '@/apis/models'; -export const postNdmCameraPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmCameraPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmCamera/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmCamera/page`, pageQuery, { signal }); const [err, ndmCameraData] = resp; if (err || !ndmCameraData) { throw err; diff --git a/src/apis/requests/device/video/ndm-decoder.ts b/src/apis/requests/device/video/ndm-decoder.ts index 052f083..1f81355 100644 --- a/src/apis/requests/device/video/ndm-decoder.ts +++ b/src/apis/requests/device/video/ndm-decoder.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmDecoderPageQuery, PageResult, NdmDecoderResultVO, NdmDecoderUpdateVO } from '@/apis/models'; -export const postNdmDecoderPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmDecoderPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmDecoder/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmDecoder/page`, pageQuery, { signal }); const [err, ndmDecoderData] = resp; if (err || !ndmDecoderData) { throw err; diff --git a/src/apis/requests/device/video/ndm-keyboard.ts b/src/apis/requests/device/video/ndm-keyboard.ts index 17ed09d..9aea732 100644 --- a/src/apis/requests/device/video/ndm-keyboard.ts +++ b/src/apis/requests/device/video/ndm-keyboard.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmKeyboardPageQuery, PageResult, NdmKeyboardResultVO, NdmKeyboardUpdateVO } from '@/apis/models'; -export const postNdmKeyboardPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmKeyboardPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmKeyboard/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmKeyboard/page`, pageQuery, { signal }); const [err, ndmKeyboardData] = resp; if (err || !ndmKeyboardData) { throw err; diff --git a/src/apis/requests/device/video/ndm-media-server.ts b/src/apis/requests/device/video/ndm-media-server.ts index 8766a3a..ae7b281 100644 --- a/src/apis/requests/device/video/ndm-media-server.ts +++ b/src/apis/requests/device/video/ndm-media-server.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmMediaServerPageQuery, PageResult, NdmMediaServerResultVO, NdmMediaServerUpdateVO } from '@/apis/models'; -export const postNdmMediaServerPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmMediaServerPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmMediaServer/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmMediaServer/page`, pageQuery, { signal }); const [err, ndmMediaServerData] = resp; if (err || !ndmMediaServerData) { throw err; diff --git a/src/apis/requests/device/video/ndm-video-server.ts b/src/apis/requests/device/video/ndm-video-server.ts index d7729bc..eec6ee9 100644 --- a/src/apis/requests/device/video/ndm-video-server.ts +++ b/src/apis/requests/device/video/ndm-video-server.ts @@ -1,9 +1,9 @@ import { ndmClient } from '@/apis/client'; import type { PageParams, NdmVideoServerPageQuery, PageResult, NdmVideoServerResultVO, NdmVideoServerUpdateVO } from '@/apis/models'; -export const postNdmVideoServerPage = async (stationCode: string, pageQuery: PageParams) => { +export const postNdmVideoServerPage = async (stationCode: string, pageQuery: PageParams, signal?: AbortSignal) => { const prefix = stationCode ? `/${stationCode}` : ''; - const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmVideoServer/page`, pageQuery); + const resp = await ndmClient.post>(`${prefix}/api/ndm/ndmVideoServer/page`, pageQuery, { signal }); const [err, ndmVideoServerData] = resp; if (err || !ndmVideoServerData) { throw err; diff --git a/src/components/device-alarm-detail-modal.vue b/src/components/device-alarm-detail-modal.vue index 57d5a9b..298a13c 100644 --- a/src/components/device-alarm-detail-modal.vue +++ b/src/components/device-alarm-detail-modal.vue @@ -1,11 +1,10 @@ -`