处理人像页面BUG

apps/web-antd/src/api/analytics/index.ts

@@ -13,52 +13,63 @@ export function getIndexCount() {
 export function getStatisticsCurrDay() {
   return requestClient.get<any>('/sis/alarmEvents/query/statistics/currDay');
 }
+
 // 所有预警信息分类统计
 export function getStatistics() {
   return requestClient.get<any>('/sis/alarmEvents/query/statistics');
 }
+
 // 工单
 export function getworkOrder() {
-  return requestClient.get<any>('/property/screen/typeWorkOrderHistogram');
+  return requestClient.get<any>(
+    '/property/cockpit/screen/typeWorkOrderHistogram',
+  );
 }
+
 // 会议室
 export function getTodayMeetCount() {
-  return requestClient.get<any>('/property/screen/todayMeetCount');
+  return requestClient.get<any>('/property/cockpit/screen/todayMeetCount');
 }
+
 // 水电
 export function getHydropower() {
   return requestClient.get<any>('/property/meterInfo/statusCount');
 }
+
 // 门禁
 export function getAccessControl() {
   return requestClient.get<any>('/sis/e8/door/online');
 }
+
 // 摄像头状态
 export function getCamera() {
   return requestClient.get<any>('/sis/deviceManage/online');
 }
+
 // 访客
 export function getVisitorCount() {
-  return requestClient.get<any>('/property/screen/todayVisitorCount');
+  return requestClient.get<any>('/property/cockpit/screen/todayVisitorCount');
 }
+
 //车流
 export async function queryTwentyfourRunningDatasByPlNos() {
   let params = {
-    "orgId": "10012",
+    orgId: '10012',
-    "plNos": [
+    plNos: ['PFN000000012', 'PFN000000025'],
-      "PFN000000012",
-      "PFN000000025"
-    ]
   };
-  const response = await fetch('https://server.cqnctc.com:6081/web/thirdParty/queryTwentyfourRunningDatasByPlNos', {
+  const response = await fetch(
+    'https://server.cqnctc.com:6081/web/thirdParty/queryTwentyfourRunningDatasByPlNos',
+    {
       method: 'POST', // 指定请求方法为POST
       headers: {
         'Content-Type': 'application/json', // 设置内容类型为JSON
       },
       body: JSON.stringify(params), // 将参数对象转换为JSON字符串并作为请求体发送
-  });
+    },
+  );
   return response.json();
 }
+
 // /**
 //  * 导出资产管理列表
 //  * @param params

apps/web-antd/src/views/sis/personLibImg/data.tsx

@@ -7,13 +7,17 @@ import { getPopupContainer } from '@vben/utils';
 import { getDictOptions } from '#/utils/dict';
 import { renderDict } from '#/utils/render';
 
+const rosterTypeOption = getDictOptions(DictEnum.ROSTER_TYPE, true);
+const userSexOption = getDictOptions(DictEnum.SYS_USER_SEX, true);
+const certificateOption = getDictOptions(DictEnum.SYS_CERTIFICATE_TYPE, true);
+
 export const querySchema: FormSchemaGetter = () => [
   {
     label: '人员标签',
     fieldName: 'rosterType',
     component: 'Select',
     componentProps: {
-      options: getDictOptions('roster_type'),
+      options: rosterTypeOption,
     },
   },
   {
@@ -25,7 +29,7 @@ export const querySchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       getPopupContainer,
-      options: getDictOptions(DictEnum.SYS_USER_SEX),
+      options: userSexOption,
     },
     fieldName: 'sex',
     label: '性别',
@@ -41,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'libCode',
   },*/
   {
-    title: '人像名称',
+    title: '人员名称',
     field: 'imgName',
   },
   {
@@ -49,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'sex',
     slots: {
       default: ({ row }) => {
-        return renderDict(row.sex, 'sys_user_sex');
+        return renderDict(row.sex, DictEnum.SYS_USER_SEX);
       },
     },
   },
@@ -66,7 +70,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'certificateType',
     slots: {
       default: ({ row }) => {
-        return renderDict(row.certificateType, 'sys_certificate_type');
+        return renderDict(row.certificateType, DictEnum.SYS_CERTIFICATE_TYPE);
       },
     },
   },
@@ -83,7 +87,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'rosterType',
     slots: {
       default: ({ row }) => {
-        return renderDict(row.rosterType, 'roster_type');
+        return renderDict(row.rosterType, DictEnum.ROSTER_TYPE);
       },
     },
     width: 100,
@@ -97,11 +101,6 @@ export const columns: VxeGridProps['columns'] = [
   },
 ];
 
-const test = getDictOptions('roster_type');
-test.forEach((item) => {
-  console.log('item', item);
-});
-
 export const modalSchema: FormSchemaGetter = () => [
   {
     label: '主键',
@@ -118,11 +117,12 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Select',
     rules: 'required',
     componentProps: {
-      options: getDictOptions('roster_type'),
+      getPopupContainer,
+      options: rosterTypeOption,
     },
   },
   {
-    label: '人像名称',
+    label: '人员名称',
     fieldName: 'imgName',
     component: 'Input',
     rules: 'required',
@@ -133,7 +133,7 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       getPopupContainer,
-      options: getDictOptions(DictEnum.SYS_USER_SEX),
+      options: userSexOption,
     },
   },
   {
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Select',
     componentProps: {
       getPopupContainer,
-      options: getDictOptions(DictEnum.SYS_CERTIFICATE_TYPE),
+      options: certificateOption,
     },
   },
   {

packages/@core/base/shared/src/constants/dict-enum.ts

@@ -11,6 +11,7 @@ export const DictEnum = {
   SYS_USER_SEX: 'sys_user_sex', // 性别
   SYS_YES_NO: 'sys_yes_no', // 是否
   SYS_CERTIFICATE_TYPE: 'sys_certificate_type', // 证件类型
+  ROSTER_TYPE:"roster_type",
   WF_BUSINESS_STATUS: 'wf_business_status', // 业务状态
   WF_FORM_TYPE: 'wf_form_type', // 表单类型
   WF_TASK_STATUS: 'wf_task_status', // 任务状态