From b8244159a8bbe659b92a196b56dc21da7ab34a02 Mon Sep 17 00:00:00 2001 From: lxj <15683799673@163.com> Date: Fri, 12 Sep 2025 14:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BA=BA=E5=83=8F=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/analytics/index.ts | 39 ++++++++++++------- .../src/views/sis/personLibImg/data.tsx | 30 +++++++------- .../base/shared/src/constants/dict-enum.ts | 1 + 3 files changed, 41 insertions(+), 29 deletions(-) diff --git a/apps/web-antd/src/api/analytics/index.ts b/apps/web-antd/src/api/analytics/index.ts index f2f58cbe..74b29f2a 100644 --- a/apps/web-antd/src/api/analytics/index.ts +++ b/apps/web-antd/src/api/analytics/index.ts @@ -13,52 +13,63 @@ export function getIndexCount() { export function getStatisticsCurrDay() { return requestClient.get('/sis/alarmEvents/query/statistics/currDay'); } + // 所有预警信息分类统计 export function getStatistics() { return requestClient.get('/sis/alarmEvents/query/statistics'); } + // 工单 export function getworkOrder() { - return requestClient.get('/property/screen/typeWorkOrderHistogram'); + return requestClient.get( + '/property/cockpit/screen/typeWorkOrderHistogram', + ); } + // 会议室 export function getTodayMeetCount() { - return requestClient.get('/property/screen/todayMeetCount'); + return requestClient.get('/property/cockpit/screen/todayMeetCount'); } + // 水电 export function getHydropower() { return requestClient.get('/property/meterInfo/statusCount'); } + // 门禁 export function getAccessControl() { return requestClient.get('/sis/e8/door/online'); } + // 摄像头状态 export function getCamera() { return requestClient.get('/sis/deviceManage/online'); } + // 访客 export function getVisitorCount() { - return requestClient.get('/property/screen/todayVisitorCount'); + return requestClient.get('/property/cockpit/screen/todayVisitorCount'); } + //车流 export async function queryTwentyfourRunningDatasByPlNos() { let params = { - "orgId": "10012", - "plNos": [ - "PFN000000012", - "PFN000000025" - ] + orgId: '10012', + plNos: ['PFN000000012', 'PFN000000025'], }; - const response = await fetch('https://server.cqnctc.com:6081/web/thirdParty/queryTwentyfourRunningDatasByPlNos', { - method: 'POST', // 指定请求方法为POST - headers: { - 'Content-Type': 'application/json', // 设置内容类型为JSON + 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字符串并作为请求体发送 }, - body: JSON.stringify(params), // 将参数对象转换为JSON字符串并作为请求体发送 - }); + ); return response.json(); } + // /** // * 导出资产管理列表 // * @param params diff --git a/apps/web-antd/src/views/sis/personLibImg/data.tsx b/apps/web-antd/src/views/sis/personLibImg/data.tsx index b1f3309c..e87fc88f 100644 --- a/apps/web-antd/src/views/sis/personLibImg/data.tsx +++ b/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, }, }, { diff --git a/packages/@core/base/shared/src/constants/dict-enum.ts b/packages/@core/base/shared/src/constants/dict-enum.ts index c9cd1003..3234a7e0 100644 --- a/packages/@core/base/shared/src/constants/dict-enum.ts +++ b/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', // 任务状态