From 2400c2a27c50290214e0c3580201f3791d655a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 24 Apr 2026 15:49:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E5=BD=95=E5=83=8F=E6=9C=BA=E5=90=8C=E6=97=B6=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E6=91=84=E5=83=8F=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/integration/CameraList.vue | 20 +++++++++++++------ .../components/integration/integration.api.ts | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/device/manager/components/integration/CameraList.vue b/src/views/device/manager/components/integration/CameraList.vue index 1d087d7..29159c0 100644 --- a/src/views/device/manager/components/integration/CameraList.vue +++ b/src/views/device/manager/components/integration/CameraList.vue @@ -33,7 +33,7 @@ import { ref, reactive} from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { deviceColumns } from './integration.data'; -import {cameraList, pullCamera} from './integration.api'; +import {cameraList, pullRecorder,pullCamera} from './integration.api'; import { useUserStore } from '/@/store/modules/user'; import CameraPreviewModal from '/@/views/iot/tplink/camera/components/CameraPreviewModal.vue' const previewModal = ref(); @@ -119,11 +119,19 @@ function handlePreview(record: Recordable) { * 拉取设备 */ async function handlePull(record: Recordable) { - await pullCamera(record).then((res) => { - setTimeout(() => { - reload(); - }, 4000); - }) + if(record.deviceType == 'NETWORKVIDEORECORDER'){ + await pullRecorder(record).then((res) => { + setTimeout(() => { + reload(); + }, 8000); + }) + }else{ + await pullCamera(record).then((res) => { + setTimeout(() => { + reload(); + }, 4000); + }) + } } /** diff --git a/src/views/device/manager/components/integration/integration.api.ts b/src/views/device/manager/components/integration/integration.api.ts index c6c0fcc..b36950d 100644 --- a/src/views/device/manager/components/integration/integration.api.ts +++ b/src/views/device/manager/components/integration/integration.api.ts @@ -7,6 +7,7 @@ enum Api { waterList = '/iot/device/manager/waterList', humidList = '/iot/device/manager/humidList', + pullRecorder = '/iot/device/manager/pullRecorder', pullCamera = '/iot/device/manager/pullCamera', pullNetwork = '/iot/device/manager/pullNetwork', pullElectricity = '/iot/device/manager/pullElectricity', @@ -25,6 +26,7 @@ export const electricityList = (params) => defHttp.get({ url: Api.electricityLis export const waterList = (params) => defHttp.get({ url: Api.waterList, params }); export const humidList = (params) => defHttp.get({ url: Api.humidList, params }); +export const pullRecorder = (params) => defHttp.post({ url: Api.pullRecorder, params }); export const pullCamera = (params) => defHttp.post({ url: Api.pullCamera, params }); export const pullNetwork = (params) => defHttp.post({ url: Api.pullNetwork, params }); export const pullElectricity = (params) => defHttp.post({ url: Api.pullElectricity, params });