p6molspfw
/
xgd_system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

Browse Source
master_055
张瑞宁 2 years ago
parent bd7e716842
commit ecfc9bec31
11 changed files with 140 additions and 72 deletions
Show Stats Download Patch File Download Diff File

2
src/layouts/index.tsx
Unescape View File

@ -40,7 +40,7 @@ const options63=[
const leftMenuType: any = { const leftMenuType: any = {
// 设备管理 // 设备管理
'设备注册': <LeftMenuTree key={1} data={MenuType['设备注册']} />, '设备注册': <LeftMenuTree key={1} data={MenuType['设备注册']} />,
'离线管理1':<LeftMenuStep currStep={1} allStep={4} stepName={'设备离线管理'} />, '离线管理':<LeftMenuStep currStep={1} allStep={4} stepName={'设备离线管理'} />,
// 密钥管理 // 密钥管理
'预制密钥':<LeftMenuA data={MenuType['预制密钥']}/>, '预制密钥':<LeftMenuA data={MenuType['预制密钥']}/>,
'密钥装配': <LeftMenuTree key={1} data={MenuType['密钥装配']} />, '密钥装配': <LeftMenuTree key={1} data={MenuType['密钥装配']} />,

86
src/pages/MachineManage/MachineRegister/components/AddModal.tsx
Unescape View File

@ -1,7 +1,9 @@
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef } from 'react';
import { Modal, Form, Input,message,DatePicker } from 'antd'; import { Modal, Form, Input, message, DatePicker, Select } from 'antd';
import ButtonComp from '@/components/ButtonComp'; import ButtonComp from '@/components/ButtonComp';
import { addPasswordDeviceInfo } from '@/services/device'; import { addPasswordDeviceInfo } from '@/services/device';
import styles from './index.less';
import moment from 'moment';
interface PageProps { interface PageProps {
title?: string; title?: string;
@ -19,32 +21,33 @@ const AddModal = ({
}: PageProps) => { }: PageProps) => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const passwordDeviceInfo = { const passwordDeviceInfo = {
"belongCryptoSystem": "string", "belongCryptoSystem": "",
"communicationAddressType": "string", "communicationAddressType": "",
"createTime": "string", "createTime": "",
"deviceAliases": "string", "deviceAliases": "",
"equipmentDeploymentLocation": "string", "equipmentDeploymentLocation": "",
"equipmentManagementUnit": "string", "equipmentManagementUnit": "",
"equipmentManufacturer": "string", "equipmentManufacturer": "",
"equipmentType": "string", "equipmentType": "",
"equipmentUserUnit": "string", "equipmentUserUnit": "",
"id": 0, "id": '',
"isolatorExternalNetworkIp": "string", "isolatorExternalNetworkIp": "",
"memo": "string", "memo": "",
"passwordDeviceNumber": "string", "passwordDeviceNumber": "",
"passwordDeviceSerialNumber": "string", "passwordDeviceSerialNumber": "",
"passwordEntityIdentifier": "string", "passwordEntityIdentifier": "",
"registrationDate": "string", "registrationDate": "",
"superiorEquipmentNumber": "string", "superiorEquipmentNumber": "",
"sysType": "string", "sysType": "",
"updateTime": "string" "updateTime": ""
}; };
const onFinish = (values: any) => { const onFinish = (values: any) => {
values.registrationDate=values['registrationDate'].format('YYYY-MM-DD'), values.registrationDate = (values['registrationDate'] || moment()).format('YYYY-MM-DD'),
addPasswordDeviceInfo({ ...values, passwordDeviceInfo }).then((res) => { addPasswordDeviceInfo({ ...values, passwordDeviceInfo }).then((res) => {
if (res?.result == "success") { if (res?.result == "success") {
message.success('新增成功'); message.success('新增成功');
onCancel();
form.resetFields(); form.resetFields();
} else { } else {
message.error(res?.errorMsg); message.error(res?.errorMsg);
@ -67,6 +70,7 @@ const AddModal = ({
onFinish={onFinish} onFinish={onFinish}
form={form} form={form}
style={{ maxHeight: '500px', overflow: 'auto' }} style={{ maxHeight: '500px', overflow: 'auto' }}
className={styles.formWrap}
> >
<Form.Item name="belongCryptoSystem" label="所属密码系统"> <Form.Item name="belongCryptoSystem" label="所属密码系统">
<Input placeholder="请输入所属密码系统" /> <Input placeholder="请输入所属密码系统" />
@ -75,43 +79,57 @@ const AddModal = ({
<Input placeholder="请输入所属设备类型" /> <Input placeholder="请输入所属设备类型" />
</Form.Item> </Form.Item>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Form.Item name="passwordEntityIdentifier" label="密码实体标识" rules={[{ required: true, message: '请选择密码实体标识' },]}> <Form.Item style={{flex:'1'}} name="passwordEntityIdentifier" label="密码实体标识" rules={[{ required: true, message: '请选择密码实体标识' },]}>
<Input placeholder="请选择密码实体标识" /> <Input placeholder="请选择密码实体标识" />
</Form.Item> </Form.Item>
{/* <ButtonComp text={'选择'} style={{ marginLeft: '20px' }} onClick={() => { }} /> */} {/* <ButtonComp text={'选择'} style={{ marginLeft: '20px' }} onClick={() => { }} /> */}
</div> </div>
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<Form.Item name="passwordDeviceSerialNumber" label="密码设备序号" rules={[{ required: true, message: '请选择密码设备序号' },]}> <div style={{flex:'1'}}>
<Form.Item name="passwordDeviceSerialNumber" label="密码设备序号" rules={[{ required: true, message: '请输入密码设备序号' },]}>
<Input placeholder="请输入密码设备序号" /> <Input placeholder="请输入密码设备序号" />
</Form.Item> </Form.Item>
</div>
<div style={{ marginLeft: '20px' }}>（如0000001）</div> <div style={{ marginLeft: '20px' }}>（如0000001）</div>
</div> </div>
<Form.Item name="passwordDeviceNumber" label="密码设备编号" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="passwordDeviceNumber" label="密码设备编号" >
<Input placeholder="请输入密码设备编号" /> <Input placeholder="请输入密码设备编号" />
</Form.Item> </Form.Item>
<Form.Item name="superiorEquipmentNumber" label="上级设备编号" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="superiorEquipmentNumber" label="上级设备编号" rules={[{ required: true, message: '请输入上级设备编号' },]}>
<Input placeholder="请输入上级设备编号" /> <Input placeholder="请输入上级设备编号" />
</Form.Item> </Form.Item>
<Form.Item name="equipmentUserUnit" label="设备使用单位" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="equipmentUserUnit" label="设备使用单位">
<Input placeholder="请输入设备使用单位" /> <Input placeholder="请输入设备使用单位" />
</Form.Item> </Form.Item>
<Form.Item name="equipmentDeploymentLocation" label="设备部署地点" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="equipmentDeploymentLocation" label="设备部署地点" >
<Input placeholder="请输入设备部署地点" /> <Input placeholder="请输入设备部署地点" />
</Form.Item> </Form.Item>
<Form.Item name="equipmentManagementUnit" label="设备管理单位" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="equipmentManagementUnit" label="设备管理单位" rules={[{ required: true, message: '请选择设备管理单位' },]}>
<Input placeholder="请选择设备管理单位" /> <Select placeholder="请选择设备管理单位">
<Option value="单位1">单位11</Option>
<Option value="单位2">单位2</Option>
<Option value="单位3">单位3</Option>
</Select>
</Form.Item> </Form.Item>
<Form.Item name="communicationAddressType" label="通信地址类型" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="communicationAddressType" label="通信地址类型" rules={[{ required: true, message: '请选择通信地址类型' },]}>
<Input placeholder="请选择通信地址类型" /> <Select placeholder="请选择通信地址类型">
<Option value="网络地址">网络地址</Option>
<Option value="电信地址">电信地址</Option>
<Option value="移动地址">移动地址</Option>
</Select>
</Form.Item> </Form.Item>
<Form.Item name="isolatorExternalNetworkIp" label="隔离器外网IP" rules={[{ required: true, message: '请选择密码设备序号' },]}> <Form.Item name="isolatorExternalNetworkIp" label="隔离器外网IP" rules={[{ required: true, message: '请输入隔离器外网IP' },]}>
<Input placeholder="请输入隔离器外网IP" /> <Input placeholder="请输入隔离器外网IP" />
</Form.Item> </Form.Item>
<Form.Item name="equipmentManufacturer" label="设备生产厂商（可空）"> <Form.Item name="equipmentManufacturer" label="设备生产厂商（可空）">
<Input placeholder="请选择设备生产厂商" /> <Select placeholder="请选择设备生产厂商">
<Option value="厂商1">厂商1</Option>
<Option value="厂商2">厂商2</Option>
<Option value="厂商3">厂商3</Option>
</Select>
</Form.Item> </Form.Item>
<Form.Item name="deviceAliases" label="设备别名（可空）"> <Form.Item name="deviceAliases" label="设备别名（可空）">
<Input placeholder="请选择设备别名" /> <Input placeholder="请输入设备别名" />
</Form.Item> </Form.Item>
<Form.Item name="memo" label="备注信息（可空）"> <Form.Item name="memo" label="备注信息（可空）">
<Input placeholder="请输入备注信息" /> <Input placeholder="请输入备注信息" />

14
src/pages/MachineManage/MachineRegister/components/index.less
Unescape View File

@ -0,0 +1,14 @@
.formWrap {
label {
font-size: 14px;
}
div[class~='ant-form-item-control-input-content'] {
font-size: 14px;
}
div[class~='ant-form-item-label'] {
width: 160px;
text-align: right;
}
}

15
src/pages/MachineManage/MachineRegister/index.less
Unescape View File

@ -4,3 +4,18 @@
margin-left:20px; margin-left:20px;
margin-top:10px; margin-top:10px;
} }
.formWrap {
label {
font-size: 14px;
}
div[class~='ant-form-item-control-input-content'] {
font-size: 14px;
}
div[class~='ant-form-item-label'] {
width: 100px;
text-align: right;
}
}

38
src/pages/MachineManage/MachineRegister/index.tsx
Unescape View File

@ -34,10 +34,10 @@ const MachineRegister: FC<PageProps> = ({ }) => {
let sysInfo = localStorage.getItem(`${urlParams?.fileType}`); let sysInfo = localStorage.getItem(`${urlParams?.fileType}`);
let info = sysInfo ? JSON.parse(sysInfo) : null; let info = sysInfo ? JSON.parse(sysInfo) : null;
useEffect(() => { // useEffect(() => {
installSuccess() // installSuccess()
}, []) // }, [])
useEffect(() => { useEffect(() => {
if (info?.nodeInitStatus) { if (info?.nodeInitStatus) {
@ -51,22 +51,22 @@ const MachineRegister: FC<PageProps> = ({ }) => {
// 在指定的目录下安装快捷方式 // 在指定的目录下安装快捷方式
const installSuccess = async () => { // const installSuccess = async () => {
try { // try {
const response = await fetch('http://localhost:3001/createShortcut', { // const response = await fetch('http://localhost:3001/createShortcut', {
method: 'POST', // method: 'POST',
headers: { 'Content-Type': 'application/json' }, // headers: { 'Content-Type': 'application/json' },
mode: "cors", // mode: "cors",
body: JSON.stringify({ // body: JSON.stringify({
folderPath: `${DEV.FILE_URL}/${countType[urlParams?.fileType]}`, // folderPath: `${DEV.FILE_URL}/${countType[urlParams?.fileType]}`,
shortcutName: '客户端', // shortcutName: '客户端',
shortcutURL: `${DEV.LOCAL_URL}/machineManage/register/${urlParams?.fileType}?sysType=${encodeURIComponent(sysType[urlParams?.fileType] + 'hx')}` // shortcutURL: `${DEV.LOCAL_URL}/machineManage/register/${urlParams?.fileType}?sysType=${encodeURIComponent(sysType[urlParams?.fileType] + 'hx')}`
}), // }),
}); // });
} catch (error) { // } catch (error) {
message.error(error); // 处理请求错误 // message.error(error); // 处理请求错误
} // }
} // }
const columns = [{ const columns = [{

6
src/pages/MachineManage/OffLineManage/ImportStep/index.tsx
Unescape View File

@ -26,6 +26,7 @@ interface PageProps {
} }
const ImportStep: FC<PageProps> = ({ }) => { const ImportStep: FC<PageProps> = ({ }) => {
const urlParams = useParams();
const [step, setStep] = useState(2) const [step, setStep] = useState(2)
const props: UploadProps = { const props: UploadProps = {
@ -35,9 +36,8 @@ const ImportStep: FC<PageProps> = ({ }) => {
const formData = new FormData(); const formData = new FormData();
formData.append('file', file); formData.append('file', file);
formData.append('sysType ', sysTypeStr[str]); formData.append('sysType ', sysTypeStr[str]);
console.log("formData--", formData)
offlineImport(formData).then((res) => { offlineImport(formData).then((res) => {
if (res?.result == "success" && res?.data.length > 0) { if (res?.result == "success" && res?.data.length >= 0) {
message.success('加载数据成功'); message.success('加载数据成功');
// form.setFieldsValue({ ...res?.data[0] }) // form.setFieldsValue({ ...res?.data[0] })
// localStorage.setItem('MMJInit', JSON.stringify(res?.data[0])); // localStorage.setItem('MMJInit', JSON.stringify(res?.data[0]));
@ -65,7 +65,7 @@ const ImportStep: FC<PageProps> = ({ }) => {
<ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'下一步'} onClick={() => { }} /> <ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'下一步'} onClick={() => { }} />
<ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'上一步'} onClick={() => { history.back() }} /> <ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'上一步'} onClick={() => { history.back() }} />
<Upload {...props} showUploadList={false}> <Upload {...props} showUploadList={false}>
<ButtonComp style={{ marginRight: 20 }} text={'加载数据'} /> <ButtonComp style={{ marginRight: 20 }} text={'开始'} />
</Upload> </Upload>
<ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'退出'} onClick={() => { }} /> <ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'退出'} onClick={() => { }} />
</div> </div>

4
src/pages/MachineManage/OffLineManage/index.tsx
Unescape View File

@ -18,7 +18,7 @@ const PageName: FC<PageProps> = ({ }) => {
} }
return ( return (
<section> <section style={{margin:'20px'}}>
<ContentWarp text='设备离线管理操作'> <ContentWarp text='设备离线管理操作'>
<Radio.Group style={{ margin: '20px' }} onChange={handleRadioChange} value={radioValue}> <Radio.Group style={{ margin: '20px' }} onChange={handleRadioChange} value={radioValue}>
<Space direction="vertical"> <Space direction="vertical">
@ -29,7 +29,7 @@ const PageName: FC<PageProps> = ({ }) => {
</Radio.Group> </Radio.Group>
</ContentWarp> </ContentWarp>
<div className='flex_jE_AC'> <div className='flex_jE_AC' style={{marginTop:'20px'}}>
<ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'下一步'} onClick={() => { <ButtonComp style={{ marginRight: 20 }} type={'cancel'} text={'下一步'} onClick={() => {
if(radioValue ==1){ if(radioValue ==1){
history.push(`/machineManage/offline/import/${urlStr}`) history.push(`/machineManage/offline/import/${urlStr}`)

19
src/pages/NodeInitTool/index.tsx
Unescape View File

@ -123,6 +123,7 @@ const NodeInitTool: FC<PageProps> = ({ }) => {
}).then((res) => { }).then((res) => {
if (res?.result == "success") { if (res?.result == "success") {
message.success('初始化成功'); message.success('初始化成功');
installSuccess2()
localStorage.setItem(`${urlParams?.fileType}`, JSON.stringify({ ...info, nodeInitStatus: true })) localStorage.setItem(`${urlParams?.fileType}`, JSON.stringify({ ...info, nodeInitStatus: true }))
form.resetFields(); form.resetFields();
} else { } else {
@ -132,6 +133,24 @@ const NodeInitTool: FC<PageProps> = ({ }) => {
}; };
const installSuccess2 = async () => {
try {
const response = await fetch('http://localhost:3001/createShortcut', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
mode: "cors",
body: JSON.stringify({
folderPath: `${DEV.FILE_URL}/${countType[urlParams?.fileType]}`,
shortcutName: '客户端',
shortcutURL: `${DEV.LOCAL_URL}/machineManage/register/${urlParams?.fileType}?sysType=${encodeURIComponent(sysType[urlParams?.fileType] + 'hx')}`
}),
});
} catch (error) {
message.error(error); // 处理请求错误
}
}
return ( return (
<section style={{ width: '1200px', margin: '20px auto' }}> <section style={{ width: '1200px', margin: '20px auto' }}>
<Modal <Modal

1
src/pages/SecretManage/ReceiveSecret/index.tsx
Unescape View File

@ -20,6 +20,7 @@ interface PageProps {
} }
const ReceiveSecret: FC<PageProps> = ({ }) => { const ReceiveSecret: FC<PageProps> = ({ }) => {
const urlParams = useParams();
const [form] = Form.useForm(); const [form] = Form.useForm();
const formItemSty = { width: 'auto', marginBottom: 20, marginRight: 30 }; const formItemSty = { width: 'auto', marginBottom: 20, marginRight: 30 };

3
src/services/device.ts
Unescape View File

@ -6,7 +6,8 @@ export async function addPasswordDeviceInfo(data: any) {
} }
// 离线管理--导入 // 离线管理--导入
export async function offlineImport(data: any) { export async function offlineImport(data: any) {
return postRequest(`/055/device/offlineManagement`, data); console.log("data")
return uploadFile(`/055/device/offlineManagement`, data);
} }

2
src/utils/menu.ts
Unescape View File

@ -2,7 +2,7 @@ export const tabsType: any = {
1: [ 1: [
{ id: 1, name: '设备注册', url: '/machineManage/register' }, { id: 1, name: '设备注册', url: '/machineManage/register' },
{ id: 2, name: '在线管理' }, { id: 2, name: '在线管理' },
{ id: 3, name: '离线管理1', url: '/machineManage/offline' }, { id: 3, name: '离线管理', url: '/machineManage/offline' },
{ id: 4, name: '黑名单' }, { id: 4, name: '黑名单' },
{ id: 5, name: '报表管理' }, { id: 5, name: '报表管理' },
], ],

Write Preview
Loading…
Cancel
Save