diff --git a/.env.development b/.env.development index a89ad84..e1113fc 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ VITE_API_BASE_URL=http://10.23.22.43:35251/api -VITE_API_NEWPOD_URL=http://10.23.22.43 +VITE_API_NEWPOD_URL=http://10.23.22.97 VITE_API_PYTHON_URL=http://10.23.22.43:8010/api VITE_APP_TITLE=视觉管理平台 diff --git a/src/api/face-recognition.js b/src/api/face-recognition.js index a31fa1e..e752930 100644 --- a/src/api/face-recognition.js +++ b/src/api/face-recognition.js @@ -37,4 +37,17 @@ export const stopFaceRecognition = () => { url: '/detection/stop', method: 'post' }) +} + +// 分页查询人脸识别记录 +export const getFaceRecordPage = (params) => { + const queryParams = new URLSearchParams() + queryParams.append('pageNum', params.pageNum || 1) + queryParams.append('pageSize', params.pageSize || 10) + if (params.startTime) queryParams.append('startTime', params.startTime) + if (params.endTime) queryParams.append('endTime', params.endTime) + return request({ + url: `/faceRecord/page?${queryParams.toString()}`, + method: 'get' + }) } \ No newline at end of file diff --git a/src/utils/fileHttp.js b/src/utils/fileHttp.js index 877e2c7..4c302a4 100644 --- a/src/utils/fileHttp.js +++ b/src/utils/fileHttp.js @@ -1,2 +1,2 @@ -const fileHttp = 'http://ngsk.tech:3900' +const fileHttp = 'https://shipllm.ngsk.tech:7001/storage' export default fileHttp \ No newline at end of file diff --git a/src/views/face-recognition/components/CameraGrid.vue b/src/views/face-recognition/components/CameraGrid.vue index 37a364d..4019e9f 100644 --- a/src/views/face-recognition/components/CameraGrid.vue +++ b/src/views/face-recognition/components/CameraGrid.vue @@ -31,45 +31,27 @@
- - +
- -
-
- {{ `${cameras[1]?.groupName}-${cameras[1]?.defaultVideoName}` }} -
-
- - -
-
- + @@ -310,15 +159,6 @@ onUnmounted(() => { height: 100%; object-fit: cover; } - - .face-canvas { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - pointer-events: none; - } } } } diff --git a/src/views/face-recognition/components/QuickActions.vue b/src/views/face-recognition/components/QuickActions.vue index 1c4880b..85ec003 100644 --- a/src/views/face-recognition/components/QuickActions.vue +++ b/src/views/face-recognition/components/QuickActions.vue @@ -21,11 +21,6 @@