fix: userRecord模块调试完成

src/api/datamanagement/dataplatform.ts

@@ -1,13 +1,10 @@
+import { PaginationRequest, PaginationResponse } from '@/types/common/type';
 import { http } from '@/utils/http/axios';
 
 /**
  * @description: 获取用户访问记录接口参数
  */
 export interface UserAccessRecordQueryParams {
-  /** 页码 */
-  pageNumber: number;
-  /** 页面大小 */
-  pageSize: number;
   /** 查询员工姓名 */
   nickname?: string;
   /** 查询工号 */
@@ -52,11 +49,13 @@ export interface UserAccessRecordList {
 /**
  * @description: 获取用户访问记录
  */
-export const getUserAccessRecords = (params: UserAccessRecordQueryParams) => {
-  return http.request<UserAccessRecordList>({
-    url: '/userRecord/getList',
-    method: 'get',
-    params,
+export const getUserAccessRecords = (
+  data: PaginationRequest & { queryParam: UserAccessRecordQueryParams },
+) => {
+  return http.request<PaginationResponse<UserAccessRecord>>({
+    url: '/admin/userRecord/getList',
+    method: 'post',
+    data,
   });
 };
 
@@ -88,7 +87,7 @@ export interface WorkshopVisitedTimes {
  */
 export const getWorkshopVisitedTimes = (params: ChartQuery) => {
   return http.request<WorkshopVisitedTimes[]>({
-    url: '/userRecord/statisticByWorkshop',
+    url: '/admin/userRecord/statisticByWorkshop',
     method: 'get',
     params,
   });
@@ -115,7 +114,7 @@ export interface CameraVisitedTimeItem {
  */
 export const getCameraVisitedTimes = (body: ChartQuery) => {
   return http.request<CameraVisitedTimeItem[]>({
-    url: '/userRecord/statisticByCamera',
+    url: '/admin/userRecord/statisticByCamera',
     method: 'post',
     data: body,
   });
@@ -126,7 +125,7 @@ export const getCameraVisitedTimes = (body: ChartQuery) => {
  */
 export const getUserVisitTimes = (params: ChartQuery) => {
   return http.request<WorkshopVisitedTimes[]>({
-    url: '/userRecord/statisticByWorkshopPerUser',
+    url: '/admin/userRecord/statisticByWorkshopPerUser',
     method: 'get',
     params,
   });
@@ -145,7 +144,7 @@ export interface UserDailyVisitTimes {
  */
 export const getUserDailyVisitTimes = (body: ChartQuery) => {
   return http.request<UserDailyVisitTimes>({
-    url: '/userRecord/statisticByWorkshopPerDay',
+    url: '/admin/userRecord/statisticByWorkshopPerDay',
     method: 'post',
     data: body,
   });

src/api/datamanagement/playback.ts

@@ -24,7 +24,7 @@ export interface GetRecordByTimeBody {
 /** 根据时间段获取违规记录点 */
 export const getRecordByTime = (data: GetRecordByTimeBody): Promise<ViolationRecordItem[]> => {
   return http.request({
-    url: '/minio/getRecordByTime',
+    url: '/admin/issueManage/getRecordByTime',
     method: 'post',
     data,
   });

src/utils/platformUtils.ts

@@ -17,7 +17,8 @@ export function formatDate(date: Date) {
   const minutes = ('0' + date.getMinutes()).slice(-2);
   const seconds = ('0' + date.getSeconds()).slice(-2);
   const milliseconds = ('00' + date.getMilliseconds()).slice(-3);
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${milliseconds}`;
+  // return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${milliseconds}`;
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
 
 export function formatWorkshopChart(data: WorkshopVisitedTimes[]) {

src/views/datamanager/platformdata/components/common/QueryTable.vue

@@ -139,6 +139,7 @@
     getUserDailyVisitTimes,
   } from '@/api/datamanagement/dataplatform';
   import { formatWorkshopChart, formatTimeChart } from '@/utils/platformUtils';
+  import { PaginationRequest } from '@/types/common/type';
 
   const queryTableRef = ref();
 
@@ -151,16 +152,20 @@
   }>();
 
   // 表格查询参数和修改事件
-  const tableQueryParams = ref<UserAccessRecordQueryParams>({
+  const tableQueryParams = ref<PaginationRequest & { queryParam: UserAccessRecordQueryParams }>({
     pageNumber: 1,
     pageSize: 10,
+    queryParam: {},
     // nickname: "",
     // username: "",
     // sortKey: "",
     // sortType: "",
   });
   const emits = defineEmits<{
-    (e: 'tableParamsChanged', parmas: UserAccessRecordQueryParams);
+    (
+      e: 'tableParamsChanged',
+      parmas: PaginationRequest & { queryParam: UserAccessRecordQueryParams },
+    );
   }>();
 
   // 页码导航栏修改事件
@@ -176,11 +181,11 @@
   // 表格排序事件
   const handleSortChange = (data: any) => {
     if (data.order !== null) {
-      tableQueryParams.value.sortKey = data.prop;
-      tableQueryParams.value.sortType = data.order.includes('a') ? 'asc' : 'desc';
+      tableQueryParams.value.queryParam.sortKey = data.prop;
+      tableQueryParams.value.queryParam.sortType = data.order.includes('a') ? 'asc' : 'desc';
     } else {
-      delete tableQueryParams.value.sortKey;
-      delete tableQueryParams.value.sortType;
+      delete tableQueryParams.value.queryParam.sortKey;
+      delete tableQueryParams.value.queryParam.sortType;
     }
     tableQueryParams.value.pageNumber = 1;
     emits('tableParamsChanged', tableQueryParams.value);
@@ -190,25 +195,25 @@
   const tableQueryType = ref<string>('姓名');
   const handleTableQueryTypeChange = (v: string) => {
     if (v === '姓名') {
-      delete tableQueryParams.value.staffNo;
+      delete tableQueryParams.value.queryParam.staffNo;
     } else {
-      delete tableQueryParams.value.nickname;
+      delete tableQueryParams.value.queryParam.nickname;
     }
     tableQueryTypeContent.value = '';
   };
 
   // 部门筛选框变化
   const handleDeptChange = (v: string) => {
-    tableQueryParams.value.deptId = v;
+    tableQueryParams.value.queryParam.deptId = v;
   };
 
   // 复用输入框绑定内容、提交事件、重置事件
   const tableQueryTypeContent = ref<string>();
   function submitTableQuery() {
     if (tableQueryType.value === '姓名') {
-      tableQueryParams.value.nickname = tableQueryTypeContent.value;
+      tableQueryParams.value.queryParam.nickname = tableQueryTypeContent.value;
     } else {
-      tableQueryParams.value.staffNo = tableQueryTypeContent.value;
+      tableQueryParams.value.queryParam.staffNo = tableQueryTypeContent.value;
     }
     emits('tableParamsChanged', tableQueryParams.value);
   }
@@ -219,6 +224,7 @@
     tableQueryParams.value = {
       pageNumber: 1,
       pageSize: 10,
+      queryParam: {},
     };
     emits('tableParamsChanged', tableQueryParams.value);
   }

src/views/datamanager/platformdata/components/query/Query.vue

@@ -52,6 +52,7 @@
   import { formatWorkshopChart, formatCameraChart } from '@/utils/platformUtils';
   import { getAllDepartments } from '@/api/auth/dept';
   import _ from 'lodash-es';
+  import { PaginationRequest } from '@/types/common/type';
 
   const departmentList = ref<any[]>([]);
 
@@ -100,9 +101,10 @@
   });
 
   // 请求表格数据
-  const tableQueryParams = ref<UserAccessRecordQueryParams>({
+  const tableQueryParams = ref<PaginationRequest & { queryParam: UserAccessRecordQueryParams }>({
     pageNumber: 1,
     pageSize: 10,
+    queryParam: {},
     // nickname: '',
     // username: '',
     // sortKey: 'statisticAll',
@@ -113,7 +115,12 @@
     () => tableQueryParams.value,
     async () => {
       const data = await getUserAccessRecords(tableQueryParams.value);
-      tableData.value = data;
+      tableData.value = {
+        list: data.records,
+        pageNumber: data.pageNumber,
+        pageSize: data.pageSize,
+        total: data.totalRow,
+      };
     },
     {
       immediate: true,