Merge branch 'release_electronic_bid_evaluation_room' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into release_electronic_bid_evaluation_room

This commit is contained in:
jl-zhoujl2
2022-09-14 10:34:16 +08:00
2 changed files with 5 additions and 4 deletions

View File

@ -70,7 +70,7 @@ const AbnormalAalarm: React.FC<{}> = () => {
} }
}, },
{ {
title: '处理状态', dataIndex: 'status', align: 'center', hideInSearch: true, title: '处理状态', dataIndex: 'status', align: 'center', hideInSearch: false,
valueEnum: { valueEnum: {
0: { text: '未处理' }, 0: { text: '未处理' },
1: { text: '已处理' }, 1: { text: '已处理' },

View File

@ -9,11 +9,12 @@ import DeviceForm from './DeviceForm';
const deviceTypeEnum = { const deviceTypeEnum = {
'resource_door': { text: '门禁' }, 'resource_door': { text: '门禁设备' },
'resource_camera': { text: '监控' }, 'resource_camera': { text: '监控设备' },
'resource_nvr': { text: 'nvr' }, 'resource_nvr': { text: 'nvr' },
'resource_encodeDevice': { text: '编码设备' }, 'resource_encodeDevice': { text: '编码设备' },
'resource_oneMachine': { text: '门禁一体机' }, 'resource_oneMachine_face': { text: '人脸一体机' },
'resource_oneMachine_card': { text: '人证一体机' },
} }
const deviceStatusEnum = { const deviceStatusEnum = {