diff --git a/src/pages/InitialSystem/PowerOnAuth/index.tsx b/src/pages/InitialSystem/PowerOnAuth/index.tsx index 1257db6..9104967 100644 --- a/src/pages/InitialSystem/PowerOnAuth/index.tsx +++ b/src/pages/InitialSystem/PowerOnAuth/index.tsx @@ -29,7 +29,7 @@ const PowerOnAuth: FC = ({ }) => { college_table_query({}).then((res) => { if (res?.result == "success" && res?.data.length > 0) { let layoutInfo: any = localStorage.getItem('powerOn'); - if (!JSON.parse(layoutInfo).powerOn) { + if (!JSON.parse(layoutInfo)) { setVisibility(true); localStorage.setItem('powerOn', JSON.stringify({ powerOn: true })); } diff --git a/src/pages/InstallExe/index.tsx b/src/pages/InstallExe/index.tsx index 2cfd308..a284e67 100644 --- a/src/pages/InstallExe/index.tsx +++ b/src/pages/InstallExe/index.tsx @@ -12,12 +12,12 @@ const InstallExe: FC = ({ }) => { { name: 'GBase', select: false }, { name: 'GBase升级程序', select: false }, { name: 'FlashPlayer9', select: false }, - { name: 'xxxx1', select: false }, - { name: 'xxxx2', select: false }, - { name: 'xxxx3', select: false }, - { name: 'xxxx4', select: false }, - { name: 'xxxx5', select: false }, - { name: 'xxxx6', select: false }, + { name: 'MSXML4', select: false }, + { name: '.NET 2.0', select: false }, + { name: '.NET 2.0 SQL', select: false }, + { name: 'HGoogleEarth', select: false }, + { name: 'MySQLServer 5.1', select: false }, + { name: 'MyODBC 3.51', select: false }, // 专用核心密码管理分系统 { name: '核心区安装程序', select: false }, { name: '执勤区安装程序', select: false }, diff --git a/src/pages/Register/PositionManage/UnitLocation/index.tsx b/src/pages/Register/PositionManage/UnitLocation/index.tsx index 58107c6..4fea875 100644 --- a/src/pages/Register/PositionManage/UnitLocation/index.tsx +++ b/src/pages/Register/PositionManage/UnitLocation/index.tsx @@ -1,9 +1,44 @@ +import { useState } from 'react'; import styles from './index.less'; +import { Input, Modal } from 'antd'; +import ButtonComp from '@/components/ButtonComp'; export default function Page() { + const [unitName, setUnitName] = useState(''); + const [visibility, setVisibility] = useState(false); + return (
- 单位位置管理 +
setVisibility(true)}>单位位置管理
+ + {/* 开机认证 */} + setVisibility(false)} + footer={null} + maskClosable={false} + > +
请通过定位按钮在地图上自定义位置
+ +
+
+ *单位名称 + setUnitName(e.target.value)} + /> +
+
+ +
+ setVisibility(false)} /> + setVisibility(false)} /> + setVisibility(false)} /> +
+
); } diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 114ec7b..6a7579b 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -46,7 +46,14 @@ export default function IndexPage() { const onFinish = async (data: any) => { setLoading(true) await getPlugCordResult(data).then(res => { - if (res?.result == 'success' && JSON.parse(res?.data[0]).data) { + // if (res?.result == 'success' && JSON.parse(res?.data[0]).data) { + // setIsAuth(true) + // localStorage.setItem('is_auth', JSON.stringify(true)); + // message.success("系统连接检测成功!") + // } else if (!JSON.parse(res?.data[0]).data) { + // message.error("系统连接检测失败!") + // } + if (res?.result == 'success') { setIsAuth(true) localStorage.setItem('is_auth', JSON.stringify(true)); message.success("系统连接检测成功!") diff --git a/src/utils/env/dev.ts b/src/utils/env/dev.ts index 84435c3..abe130c 100644 --- a/src/utils/env/dev.ts +++ b/src/utils/env/dev.ts @@ -1,6 +1,6 @@ export const DEV = { - // PROXY_SERVER: 'http://localhost:8088', - PROXY_SERVER: 'http://127.0.0.1:8088', + PROXY_SERVER: 'http://localhost:8088', + // PROXY_SERVER: 'http://127.0.0.1:8088', }; export default DEV; diff --git a/src/utils/request.ts b/src/utils/request.ts index 2dd5a16..40f4559 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -1,7 +1,7 @@ import { DEV } from './env/dev' // 是否写死请求地址 -const hardCode = true; +const hardCode = false; /** * GET 请求