diff --git a/src/layouts/LeftMenuOne/index.tsx b/src/layouts/LeftMenuOne/index.tsx index 42dd5a3..32b0936 100644 --- a/src/layouts/LeftMenuOne/index.tsx +++ b/src/layouts/LeftMenuOne/index.tsx @@ -140,7 +140,7 @@ const LeftMenuCom: FC = ({ data }) => { let children: any = []; device.forEach((item1: any) => { if (item1.unitName == item.unitName) { - children.push(item1); + children.push({...item1,title:`${item1.unitName}-${item1.title}`}); } }) item.children = children; diff --git a/src/pages/MY/KeyBodyManage/Import/index.tsx b/src/pages/MY/KeyBodyManage/Import/index.tsx index ceb8dbe..c504e0a 100644 --- a/src/pages/MY/KeyBodyManage/Import/index.tsx +++ b/src/pages/MY/KeyBodyManage/Import/index.tsx @@ -124,6 +124,7 @@ export default function Page() { const props: UploadProps = { maxCount: 1, beforeUpload: (file: any) => { + console.log("file--",file) setFileInfo(file); } }; @@ -223,7 +224,7 @@ export default function Page() { form.validateFields().then(() => { setSpeed(1); setFileInfo(null); - setProductNumber(''); + setProductNumber('B211练'); setVisibility(true) }) }} /> @@ -287,6 +288,7 @@ export default function Page() { *产品编号 setProductNumber(e.target.value)} /> diff --git a/src/pages/MY/KeyManage/KeyConfigQuery/index.tsx b/src/pages/MY/KeyManage/KeyConfigQuery/index.tsx index e875efd..4c14251 100644 --- a/src/pages/MY/KeyManage/KeyConfigQuery/index.tsx +++ b/src/pages/MY/KeyManage/KeyConfigQuery/index.tsx @@ -26,19 +26,19 @@ export default function Page() { return {c + 1}; }, }, - { title: '设备名称', dataIndex: 'deviceName', key: 'deviceName', align: 'center' }, - { title: '管理实体标识', dataIndex: 'managerModelId', key: 'managerModelId', align: 'center' }, - { title: '310标识', dataIndex: 'deviceMarkId', key: 'deviceMarkId', align: 'center' }, - { title: 'IP地址', dataIndex: 'ip', key: 'ip', align: 'center' }, - { title: '密钥种类名称', dataIndex: 'keyTypeName', key: 'keyTypeName', align: 'center' }, - { title: '密钥类型', dataIndex: 'keyType', key: 'keyType', align: 'center' }, - { title: '使用区/备用区', dataIndex: 'usageReserveArea', key: 'usageReserveArea', align: 'center' }, - { title: '产品编号', dataIndex: 'productNum', key: 'productNum', align: 'center' }, - { title: '安装方式', dataIndex: 'installMethod', key: 'installMethod', align: 'center' }, - { title: '启用日期', dataIndex: 'activeDate', key: 'activeDate', align: 'center' }, - { title: '终止日期', dataIndex: 'enterDate', key: 'enterDate', align: 'center' }, - { title: '密钥套号', dataIndex: 'setNumber', key: 'setNumber', align: 'center' }, - { title: '协同管理标志', dataIndex: 'managementFlag', key: 'managementFlag', align: 'center' } + { title: '设备名称', dataIndex: 'deviceName', key: 'deviceName', align: 'center',render: (text: any) => text || '--' }, + { title: '管理实体标识', dataIndex: 'managerModelId', key: 'managerModelId', align: 'center',render: (text: any) => text || '--' }, + { title: '310标识', dataIndex: 'deviceMarkId', key: 'deviceMarkId', align: 'center',render: (text: any) => text || '--' }, + { title: 'IP地址', dataIndex: 'ip', key: 'ip', align: 'center',render: (text: any) => text || '--' }, + { title: '密钥种类名称', dataIndex: 'keyTypeName', key: 'keyTypeName', align: 'center',render: (text: any) => text || '--' }, + { title: '密钥类型', dataIndex: 'keyType', key: 'keyType', align: 'center',render: (text: any) => text || '--' }, + { title: '使用区/备用区', dataIndex: 'usageReserveArea', key: 'usageReserveArea', align: 'center',render: (text: any) => text || '--' }, + { title: '产品编号', dataIndex: 'productNum', key: 'productNum', align: 'center',render: (text: any) => text || '--' }, + { title: '安装方式', dataIndex: 'installMethod', key: 'installMethod', align: 'center',render: (text: any) => text || '--' }, + { title: '启用日期', dataIndex: 'activeDate', key: 'activeDate', align: 'center',render: (text: any) => text || '--' }, + { title: '终止日期', dataIndex: 'enterDate', key: 'enterDate', align: 'center',render: (text: any) => text || '--' }, + { title: '密钥套号', dataIndex: 'setNumber', key: 'setNumber', align: 'center',render: (text: any) => text || '--' }, + { title: '协同管理标志', dataIndex: 'managementFlag', key: 'managementFlag', align: 'center',render: (text: any) => text || '--' } ] const columns1: any = [ @@ -48,15 +48,15 @@ export default function Page() { return {c + 1}; }, }, - { title: '设备名称', dataIndex: 'deviceName', key: 'deviceName', align: 'center' }, - { title: '管理实体标识', dataIndex: 'deviceEntityId', key: 'deviceEntityId', align: 'center' }, - { title: '310标识', dataIndex: 'deviceMarkId', key: 'deviceMarkId', align: 'center' }, - { title: 'IP地址', dataIndex: 'ip', key: 'ip', align: 'center' }, - { title: '设备型号', dataIndex: 'deviceType', key: 'deviceType', align: 'center' }, - { title: '应用系统', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '管理代理', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '设备状态', dataIndex: 'name', key: 'name', align: 'center' }, - { title: '协同管理标志', dataIndex: 'name', key: 'name', align: 'center' } + { title: '设备名称', dataIndex: 'deviceName', key: 'deviceName', align: 'center',render: (text: any) => text || '--' }, + { title: '管理实体标识', dataIndex: 'deviceEntityId', key: 'deviceEntityId', align: 'center',render: (text: any) => text || '--' }, + { title: '310标识', dataIndex: 'deviceMarkId', key: 'deviceMarkId', align: 'center',render: (text: any) => text || '--' }, + { title: 'IP地址', dataIndex: 'ip', key: 'ip', align: 'center',render: (text: any) => text || '--' }, + { title: '设备型号', dataIndex: 'deviceType', key: 'deviceType', align: 'center',render: (text: any) => text || '--' }, + { title: '应用系统', dataIndex: 'name', key: 'name', align: 'center',render: (text: any) => text || '--' }, + { title: '管理代理', dataIndex: 'name', key: 'name', align: 'center',render: (text: any) => text || '--' }, + { title: '设备状态', dataIndex: 'name', key: 'name', align: 'center',render: (text: any) => text || '--' }, + { title: '协同管理标志', dataIndex: 'name', key: 'name', align: 'center',render: (text: any) => text || '--' } ] const search = () => { } diff --git a/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx b/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx index 84299c2..85ccfbe 100644 --- a/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx +++ b/src/pages/Register/RegisterManage/DeviceRegister/AdminsTab/index.tsx @@ -29,18 +29,18 @@ export default function Page() { let info = sysData ? JSON.parse(sysData) : null; const columns: any = [ - { title: '单位名称', dataIndex: 'unitName', key: 'unitName', align: 'center' }, - { title: '系统名称', dataIndex: 'sysName', key: 'sysName', align: 'center' }, - { title: '实体标识', dataIndex: 'sysEntityId', key: 'sysEntityId', align: 'center' }, - { title: '310标识', dataIndex: 'sysMarkId', key: 'sysMarkId', align: 'center' }, - { title: '系统型号', dataIndex: 'sysType', key: 'sysType', align: 'center' }, - { title: '管理盘号', dataIndex: 'diskNumber', key: 'diskNumber', align: 'center' }, - { title: '所属网络', dataIndex: 'name', key: 'name', align: 'center' }, - { title: 'Ⅰ型隔离器外网IP', dataIndex: 'isolatorExternalIp', key: 'isolatorExternalIp', align: 'center' }, - { title: '电话号码', dataIndex: 'telephone', key: 'telephone', align: 'center' }, - { title: '联系人', dataIndex: 'contacts', key: 'contacts', align: 'center' }, - { title: '联系方式', dataIndex: 'contactsInfo', key: 'contactsInfo', align: 'center' }, - { title: '席位名称', dataIndex: 'seatName', key: 'seatName', align: 'center' } + { title: '单位名称', dataIndex: 'unitName', key: 'unitName', align: 'center',render: (text: any) => text || '--' }, + { title: '系统名称', dataIndex: 'sysName', key: 'sysName', align: 'center' ,render: (text: any) => text || '--' }, + { title: '实体标识', dataIndex: 'sysEntityId', key: 'sysEntityId', align: 'center' ,render: (text: any) => text || '--'}, + { title: '310标识', dataIndex: 'sysMarkId', key: 'sysMarkId', align: 'center' ,render: (text: any) => text || '--'}, + { title: '系统型号', dataIndex: 'sysType', key: 'sysType', align: 'center' ,render: (text: any) => text || '--'}, + { title: '管理盘号', dataIndex: 'diskNumber', key: 'diskNumber', align: 'center' ,render: (text: any) => text || '--'}, + { title: '所属网络', dataIndex: 'name', key: 'name', align: 'center' ,render: (text: any) => text || '--'}, + { title: 'Ⅰ型隔离器外网IP', dataIndex: 'isolatorExternalIp', key: 'isolatorExternalIp', align: 'center' ,render: (text: any) => text || '--'}, + { title: '电话号码', dataIndex: 'telephone', key: 'telephone', align: 'center' ,render: (text: any) => text || '--'}, + { title: '联系人', dataIndex: 'contacts', key: 'contacts', align: 'center' ,render: (text: any) => text || '--'}, + { title: '联系方式', dataIndex: 'contactsInfo', key: 'contactsInfo', align: 'center' ,render: (text: any) => text || '--'}, + { title: '席位名称', dataIndex: 'seatName', key: 'seatName', align: 'center' ,render: (text: any) => text || '--'} ] useEffect(() => {