From 349eb61436cc0d142cd7b7383c92c68bddcce363 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Tue, 13 Sep 2022 10:29:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ElecEvaluation/Device/index.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/ElecEvaluation/Device/index.tsx b/src/pages/ElecEvaluation/Device/index.tsx index 2343cfc..816eb1e 100644 --- a/src/pages/ElecEvaluation/Device/index.tsx +++ b/src/pages/ElecEvaluation/Device/index.tsx @@ -9,11 +9,12 @@ import DeviceForm from './DeviceForm'; const deviceTypeEnum = { - 'resource_door': { text: '门禁点' }, - 'resource_camera': { text: '监控点' }, + 'resource_door': { text: '门禁设备' }, + 'resource_camera': { text: '监控设备' }, 'resource_nvr': { text: 'nvr' }, 'resource_encodeDevice': { text: '编码设备' }, - 'resource_oneMachine': { text: '门禁一体机' }, + 'resource_oneMachine_face': { text: '人脸一体机' }, + 'resource_oneMachine_card': { text: '人证一体机' }, } const deviceStatusEnum = { From 72d8f6d52d2adf4865de31fc3429d7a5e684c17f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E5=B8=85?= Date: Tue, 13 Sep 2022 10:52:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ElecEvaluation/AbnormalAlarm/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx index b7a1f8d..5018166 100644 --- a/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx +++ b/src/pages/ElecEvaluation/AbnormalAlarm/index.tsx @@ -70,7 +70,7 @@ const AbnormalAalarm: React.FC<{}> = () => { } }, { - title: '处理状态', dataIndex: 'status', align: 'center', hideInSearch: true, + title: '处理状态', dataIndex: 'status', align: 'center', hideInSearch: false, valueEnum: { 0: { text: '未处理' }, 1: { text: '已处理' },