diff --git a/config/routes/index.ts b/config/routes/index.ts index 6ef9158..f082a85 100644 --- a/config/routes/index.ts +++ b/config/routes/index.ts @@ -1,6 +1,10 @@ const routes = [ - { path: '/', redirect: '/index', }, // 本地跑时为了方便先使用这个 - // { path: '/', redirect: '/404', }, // 后续上线时开放 + // { path: '/', redirect: '/index', }, // 本地跑时为了方便先使用这个 + { path: '/', redirect: '/404', }, // 后续上线时开放 + + // 桌面 + { path: '/index', name: '桌面', component: '@/pages/index', layout: false }, + // 节点初始化工具 { path: '/nodeInit/:fileType', name: '节点初始化工具', component: '@/pages/NodeInitTool', layout: false }, @@ -28,9 +32,6 @@ const routes = [ { path: '/secretmanage/offline/export/:fileType', name: '离线管理导出', component: '@/pages/SecretManage/OffLineManage/ExportStep' }, // --------------------------------------------------------------------------- - // 桌面 - { path: '/index', name: '桌面', component: '@/pages/index', layout: false }, - // 建设中页面 { diff --git a/src/pages/MachineManage/MachineRegister/index.tsx b/src/pages/MachineManage/MachineRegister/index.tsx index 4035ae6..4868d85 100644 --- a/src/pages/MachineManage/MachineRegister/index.tsx +++ b/src/pages/MachineManage/MachineRegister/index.tsx @@ -1,14 +1,14 @@ import { FC, useEffect, useState } from 'react'; import { history, useLocation, useParams } from 'umi'; import ButtonComp from '@/components/ButtonComp'; -import { Table } from 'antd'; +import { Table, message } from 'antd'; import styles from './index.less'; import CheckSelect from '@/components/CheckSelect'; import CheckInput from '@/components/CheckInput'; import AddModal from './components/AddModal'; import DEV from '@/utils/env/dev'; -import { countType,sysType } from '@/utils/sysType'; +import { countType, sysType } from '@/utils/sysType'; interface PageProps { @@ -19,15 +19,16 @@ const MachineRegister: FC = ({ }) => { const [params, setParams] = useState({ page: 1, limit: 10, - mdepart:null, //设备使用单位 - mposition:null,//设备部署地点 - mstate:null,//设备使用状态 - midentifer:null,// 密码实体标识 - mnumber:null,//上级设备编号 + mdepart: null, //设备使用单位 + mposition: null,//设备部署地点 + mstate: null,//设备使用状态 + midentifer: null,// 密码实体标识 + mnumber: null,//上级设备编号 }); + const [accessPermissions, setAccessPermissions] = useState(false); const [clearAll, setclearAll] = useState(false) // 点击复位按钮时所有的chebox都变为false const [result, setResult] = useState({}) - const [addModalVisible,setAddModalVisible] = useState(false) //控制新增弹窗显隐 + const [addModalVisible, setAddModalVisible] = useState(false) //控制新增弹窗显隐 const urlParams = useParams(); let sysInfo = localStorage.getItem(`${urlParams?.fileType}`); @@ -35,6 +36,17 @@ const MachineRegister: FC = ({ }) => { useEffect(() => { installSuccess() + + }, []) + + useEffect(() => { + if (info?.nodeInitStatus) { + setAccessPermissions(true) + localStorage.setItem(`${urlParams?.fileType}`, JSON.stringify({ ...info, accessPermissions: true })) + } else { + setAccessPermissions(false) + } + }, []) @@ -109,7 +121,7 @@ const MachineRegister: FC = ({ }) => { ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备使用单位', dataIndex: 'service_end_time', key: 'service_end_time', @@ -123,49 +135,49 @@ const MachineRegister: FC = ({ }) => { ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备管理单位', dataIndex: 'service_end_time', key: 'service_end_time', ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备生产厂商', dataIndex: 'service_end_time', key: 'service_end_time', ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备地址类型', dataIndex: 'service_end_time', key: 'service_end_time', ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备通信地址', dataIndex: 'service_end_time', key: 'service_end_time', ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备注册日期', dataIndex: 'service_end_time', key: 'service_end_time', ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '设备别名', dataIndex: 'service_end_time', key: 'service_end_time', ellipsis: true, render: (text: any, record: any, index: any) => {(record?.service_start_time && record?.service_end_time) ? `${moment(record?.service_start_time).format('YYYY-MM-DD HH:mm')} - ${moment(record?.service_end_time).format('YYYY-MM-DD HH:mm')}` : '--'} - },{ + }, { title: '备注信息', dataIndex: 'status_cn', key: 'status_cn', @@ -187,23 +199,23 @@ const MachineRegister: FC = ({ }) => { // 复位 const handleClear = () => { - params.mdepart=null; - params.mposition=null; - params.mstate=null; - params.midentifer=null; - params.mnumber=null; - setParams({...params}) + params.mdepart = null; + params.mposition = null; + params.mstate = null; + params.midentifer = null; + params.mnumber = null; + setParams({ ...params }) setclearAll(true) } const getList = () => { } - + // 查询条件改变时设置参数 - const handleChange = (value:any,param:string) =>{ - params[`${param}`]=value; - setParams({...params}) + const handleChange = (value: any, param: string) => { + params[`${param}`] = value; + setParams({ ...params }) setclearAll(false) } @@ -221,7 +233,7 @@ const MachineRegister: FC = ({ }) => { {handleChange(value,'mdepart')}} + onChange={(value) => { handleChange(value, 'mdepart') }} clearAll={clearAll} /> @@ -229,7 +241,7 @@ const MachineRegister: FC = ({ }) => { {handleChange(value,'mposition')}} + onChange={(value) => { handleChange(value, 'mposition') }} clearAll={clearAll} /> @@ -237,7 +249,7 @@ const MachineRegister: FC = ({ }) => { {handleChange(value,'mstate')}} + onChange={(value) => { handleChange(value, 'mstate') }} clearAll={clearAll} /> @@ -247,7 +259,7 @@ const MachineRegister: FC = ({ }) => { {handleChange(value,'midentifer')}} + onChange={(value) => { handleChange(value, 'midentifer') }} clearAll={clearAll} /> @@ -255,7 +267,7 @@ const MachineRegister: FC = ({ }) => { {handleChange(value,'mnumber')}} + onChange={(value) => { handleChange(value, 'mnumber') }} clearAll={clearAll} /> @@ -302,18 +314,18 @@ const MachineRegister: FC = ({ }) => { { }} />
- {setAddModalVisible(true) }} /> + { setAddModalVisible(true) }} /> { }} /> { }} /> { }} />
- + {/* 添加按钮对应的弹窗 */} - (setAddModalVisible(false))} + onCancel={() => (setAddModalVisible(false))} /> ) diff --git a/src/pages/NodeInitTool/index.tsx b/src/pages/NodeInitTool/index.tsx index 0e0cf13..4d254a5 100644 --- a/src/pages/NodeInitTool/index.tsx +++ b/src/pages/NodeInitTool/index.tsx @@ -38,9 +38,11 @@ const NodeInitTool: FC = ({ }) => { const [pin, setPin] = useState(''); const [radioValue, setRadioValue] = useState(1) - const [configRadio, setConfigRadio] = useState(1) + const [configRadio, setConfigRadio] = useState(1) // 第三步:装配操作类型 const [form] = Form.useForm(); + const [dbIp,setdpIp] = useState('127.0.0.1') //数据库服务器IP地址 + const [fileInfo, setFileInfo] = useState({ "secret": "", "algorithm": "", @@ -82,9 +84,8 @@ const NodeInitTool: FC = ({ }) => { formData.append('file', file); formData.append('sysType ', sysTypeStr[str]); nodeInit_step2(formData).then((res) => { - if (res?.result == "success" && res?.data.length > 0) { + if (res?.result == "success" && res?.data.length >= 0) { message.success('数据加载成功') - console.log("res--", res) setFileInfo(res?.data[0]); localStorage.setItem(`${urlParams?.fileType}`, JSON.stringify({ ...info, deviceInit: { data: res?.data[0], install: false } })); // setDataLoading(true); @@ -122,6 +123,7 @@ const NodeInitTool: FC = ({ }) => { }).then((res) => { if (res?.result == "success") { message.success('初始化成功'); + localStorage.setItem(`${urlParams?.fileType}`, JSON.stringify({ ...info, nodeInitStatus: true })) form.resetFields(); } else { message.error(res?.errorMsg); @@ -191,7 +193,7 @@ const NodeInitTool: FC = ({ }) => {
数据库服务器IP地址
-
+
{ }} />
diff --git a/src/pages/index.tsx b/src/pages/index.tsx index c150a95..13b5bf9 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -18,11 +18,10 @@ export default function IndexPage() { const [tishiDialog, setTishiDialog] = useState(false); const list = [ - { name: '01MMD049安装.exe', img: '', url: '/installExe' }, - { name: '初装系统', img: '', url: '/initialSystem' }, - { name: '核心管理系统', img: '', url: '/coreSystemEntrance/hx1' }, - { name: '需要导出的文件', img: '', url: null }, - { name: '生成导出的文件', img: '', url: null }, + { name: '节点初始化工具', img: '', url: '/nodeInit' }, + { name: '设备管理', img: '', url: '/machineManage/register' }, + { name: '密钥管理', img: '', url: '/secretmanage/receive' }, + { name: '063', img: '', url: null }, ] useEffect(() => { @@ -61,7 +60,6 @@ export default function IndexPage() { return (
- {setVisibility(true)}} /> { isAuth ? list.map((item, index) => { @@ -69,7 +67,7 @@ export default function IndexPage() {
{ if (item.url) { history.push(item.url) - } else if (item.name == '需要导出的文件') { + } else if (item.name == '063') { } else if (item.name == '生成导出的文件') { diff --git a/src/services/nodeinit.ts b/src/services/nodeinit.ts index 76c6dee..847d55a 100644 --- a/src/services/nodeinit.ts +++ b/src/services/nodeinit.ts @@ -3,7 +3,7 @@ import { getRequest, postRequest, uploadFile } from '@/utils/request'; // 节点初始化第二步 export async function nodeInit_step2(data: any) { console.log("data--",data) - return postRequest(`/055/nodeInit/step2`, data); + return uploadFile(`/055/nodeInit/step2`, data); } // 节点初始化第四步 export async function nodeInit_step4(data: any) { diff --git a/src/utils/env/dev.ts b/src/utils/env/dev.ts index f8cd2e4..d22f3db 100644 --- a/src/utils/env/dev.ts +++ b/src/utils/env/dev.ts @@ -1,7 +1,7 @@ export const DEV = { PROXY_SERVER: 'http://localhost:8088', // PROXY_SERVER: 'http://127.0.0.1:8088', - LOCAL_URL: 'http://localhost:8001', + LOCAL_URL: 'http://localhost:8000', FILE_URL: 'C:/Users/灯台百合/Desktop', // 快捷方式储存的路径 HARD_CODE: false };