diff --git a/src/components/ContentWarp/index.tsx b/src/components/ContentWarp/index.tsx index 099889c..63d1b00 100644 --- a/src/components/ContentWarp/index.tsx +++ b/src/components/ContentWarp/index.tsx @@ -2,7 +2,7 @@ import { FC, useEffect, useState } from 'react'; import styles from './index.less'; interface PageProps { - style: any; // 样式 + style?: any; // 样式 text: string; // 标题 children?: any; // 插槽内容 } diff --git a/src/global.less b/src/global.less index fd808c0..d02a2e6 100644 --- a/src/global.less +++ b/src/global.less @@ -3,8 +3,8 @@ @import './styles/antd.less'; ::-webkit-scrollbar { - height: 4px; - width: 4px; + height: 3px; + width: 3px; background: rgba(0, 0, 0, 0.1) !important; } diff --git a/src/layouts/BottomConfigInfo/index.less b/src/layouts/BottomConfigInfo/index.less new file mode 100644 index 0000000..4161f0c --- /dev/null +++ b/src/layouts/BottomConfigInfo/index.less @@ -0,0 +1,45 @@ +.bottom_warp { + width: 100%; + height: 140px; + background: #FFFFFF; + border-radius: 2px 0px 0px 0px; + border-top: 1px solid #D8D8D8; + display: flex; + align-items: center; + justify-content: space-between; + + .item_con { + width: 50%; + height: 100%; + display: flex; + + ._img { + width: 54px; + height: 54px; + margin: 20px; + background-color: saddlebrown; + } + + .item_info { + + &:nth-child(2), + &:nth-child(3) { + height: 22px; + font-size: 14px; + font-weight: 400; + color: #333333; + line-height: 22px; + } + } + + .item_title { + margin-top: 34px; + height: 26px; + line-height: 26px; + font-size: 16px; + font-weight: 600; + color: #333333; + margin-bottom: 10px; + } + } +} \ No newline at end of file diff --git a/src/layouts/BottomConfigInfo/index.tsx b/src/layouts/BottomConfigInfo/index.tsx new file mode 100644 index 0000000..34cba01 --- /dev/null +++ b/src/layouts/BottomConfigInfo/index.tsx @@ -0,0 +1,31 @@ +import { FC, useEffect, useState } from 'react'; +import styles from './index.less'; + +interface PageProps { +} + +const BottomConfigInfo: FC = ({}) => { + + return ( +
+
+
+
+
控制端系统配置信息
+
管理系统名称:--
+
系统IP:--
+
+
+
+
+
+
被控设备配置信息
+
设备名称:--
+
连接状态:--
+
+
+
+ ) +} + +export default BottomConfigInfo \ No newline at end of file diff --git a/src/layouts/index.less b/src/layouts/index.less index 752aa9a..2cd3a40 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -143,8 +143,6 @@ .right_route { position: relative; - height: calc(100vh - 114px - 52px); - min-height: calc(600px - 52px); overflow: hidden; overflow-y: auto; background: #F9F9F9; diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 6ebfd3f..714d14f 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -6,6 +6,7 @@ import { MenuType, tabsType } from '@/utils/menu'; import { Select, message } from 'antd'; import LeftMenuOne from '@/components/LeftMenuOne'; import LeftMenuTwo from '@/components/LeftMenuTwo'; +import BottomConfigInfo from '@/layouts/BottomConfigInfo'; const options2 = [ { value: 1, label: 'GLQ管理' }, @@ -13,7 +14,7 @@ const options2 = [ { value: 3, label: 'SB管理' }, { value: 4, label: 'SF管理' }, { value: 5, label: 'SBJK二维版', disabled: true }, - { value: 6, label: '设备注册', disabled: true } + { value: 6, label: '设备注册', disabled: true } ] const leftMenuType: any = { @@ -171,9 +172,19 @@ export default function Layout() { {/* 左侧内容 */}
-
+
+ + {/* GQL管理整个模块页面底部的配置信息 */} + {selectVal == 1 && } + {/* 底部信息 */}
软件当前版本:0.0.0
diff --git a/src/pages/GLQ/TeamViewer/ParamsSetting/index.tsx b/src/pages/GLQ/TeamViewer/ParamsSetting/index.tsx index afde3f2..98bc4d6 100644 --- a/src/pages/GLQ/TeamViewer/ParamsSetting/index.tsx +++ b/src/pages/GLQ/TeamViewer/ParamsSetting/index.tsx @@ -19,51 +19,31 @@ export default function Page() { }; return ( - <> -
- -
配置与被控端连接的连接参数
-
-
-
- - - -
-
-
- form.submit()} /> -
- { }} /> +
+ +
配置与被控端连接的连接参数
+
+
+
+ + + +
+
+
+ form.submit()} />
-
- -
-
-
-
-
-
控制端系统配置信息
-
管理系统名称:--
-
系统IP:--
-
-
-
-
-
-
被控设备配置信息
-
设备名称:--
-
连接状态:--
+ form.resetFields()} />
-
- +
+
); } diff --git a/src/pages/GLQ/WebMMJ/KeyDestruction/index.less b/src/pages/GLQ/WebMMJ/KeyDestruction/index.less deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/GLQ/WebMMJ/KeyDestruction/index.tsx b/src/pages/GLQ/WebMMJ/KeyDestruction/index.tsx index ec75060..8b4d874 100644 --- a/src/pages/GLQ/WebMMJ/KeyDestruction/index.tsx +++ b/src/pages/GLQ/WebMMJ/KeyDestruction/index.tsx @@ -1,10 +1,29 @@ -import styles from './index.less'; +import ContentWarp from '@/components/ContentWarp'; +import styles from '../../index.less'; +import ButtonComp from '@/components/ButtonComp'; +import { useState } from 'react'; // 网络MMJ管理 --> 密钥销毁 export default function Page() { + const [htmlText, setHtmlText] = useState('
文本内容
') + return ( -
- {'网络MMJ管理 --> 密钥销毁'} +
+ +
销毁被控端设备的安装密钥和分发密钥
+
+
+
+
+
+
+
+ { }} /> +
+ setHtmlText('')} /> +
+
+
); } diff --git a/src/pages/GLQ/WebMMJ/KeyRemoteKill/index.less b/src/pages/GLQ/WebMMJ/KeyRemoteKill/index.less deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/GLQ/WebMMJ/KeyRemoteKill/index.tsx b/src/pages/GLQ/WebMMJ/KeyRemoteKill/index.tsx index 05a7a93..80561d8 100644 --- a/src/pages/GLQ/WebMMJ/KeyRemoteKill/index.tsx +++ b/src/pages/GLQ/WebMMJ/KeyRemoteKill/index.tsx @@ -1,10 +1,30 @@ -import styles from './index.less'; +import ContentWarp from '@/components/ContentWarp'; +import styles from '../../index.less'; +import ButtonComp from '@/components/ButtonComp'; +import { useState } from 'react'; -// 网络MMJ管理 --> MMJ遥毙 +// 网络MMJ管理 --> 密码遥毙 export default function Page() { + const [htmlText, setHtmlText] = useState('
文本内容
') + return ( -
- {'网络MMJ管理 --> MMJ遥毙'} +
+ +
销毁被控端设备的初装密钥、安装密钥及分发密钥
+
+
+
+
+
+
+
+ { }} /> +
+ setHtmlText('')} /> +
+
+
); } + diff --git a/src/pages/GLQ/WebMMJ/MmjInitInstall/index.tsx b/src/pages/GLQ/WebMMJ/MmjInitInstall/index.tsx index d7126f6..0def8c7 100644 --- a/src/pages/GLQ/WebMMJ/MmjInitInstall/index.tsx +++ b/src/pages/GLQ/WebMMJ/MmjInitInstall/index.tsx @@ -14,72 +14,55 @@ export default function Page() { return ( - <> -
- -
配置与被控端连接的连接参数
-
-
-
- - - - - - - - - -
-
-
- form.submit()} /> -
- { }} /> +
+ +
发送密码机初装数据到被控端设备
+
+
+
+ + + + + + + + + +
+
+
+ form.submit()} />
-
- -
-
-
-
-
-
控制端系统配置信息
-
管理系统名称:--
-
系统IP:--
-
-
-
-
-
-
被控设备配置信息
-
设备名称:--
-
连接状态:--
+
+ { }} /> +
+ form.resetFields()} />
-
- +
+
); } diff --git a/src/pages/GLQ/WebMMJ/MmjRemoteKill/index.less b/src/pages/GLQ/WebMMJ/MmjRemoteKill/index.less deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/GLQ/WebMMJ/MmjRemoteKill/index.tsx b/src/pages/GLQ/WebMMJ/MmjRemoteKill/index.tsx index 05a7a93..c27f563 100644 --- a/src/pages/GLQ/WebMMJ/MmjRemoteKill/index.tsx +++ b/src/pages/GLQ/WebMMJ/MmjRemoteKill/index.tsx @@ -1,10 +1,30 @@ -import styles from './index.less'; +import ContentWarp from '@/components/ContentWarp'; +import styles from '../../index.less'; +import ButtonComp from '@/components/ButtonComp'; +import { useState } from 'react'; // 网络MMJ管理 --> MMJ遥毙 export default function Page() { + const [htmlText, setHtmlText] = useState('
文本内容
') + return ( -
- {'网络MMJ管理 --> MMJ遥毙'} +
+ +
销毁被控端设备的二次构造数据及全部密钥
+
+
+
+
+
+
注意:执行此操作后,设备需返厂修复!
+
+
+ { }} /> +
+ setHtmlText('')} /> +
+
+
); -} +} \ No newline at end of file diff --git a/src/pages/GLQ/WebMMJ/StatusQuery/index.less b/src/pages/GLQ/WebMMJ/StatusQuery/index.less deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/GLQ/WebMMJ/StatusQuery/index.tsx b/src/pages/GLQ/WebMMJ/StatusQuery/index.tsx index c69b26f..9f6dee8 100644 --- a/src/pages/GLQ/WebMMJ/StatusQuery/index.tsx +++ b/src/pages/GLQ/WebMMJ/StatusQuery/index.tsx @@ -1,10 +1,32 @@ -import styles from './index.less'; +import ContentWarp from '@/components/ContentWarp'; +import styles from '../../index.less'; +import ButtonComp from '@/components/ButtonComp'; +import { useState } from 'react'; // 网络MMJ管理 --> 状态查询 export default function Page() { + const [htmlText, setHtmlText] = useState('
文本内容
') + return ( -
- {'网络MMJ管理 --> 状态查询'} +
+ +
隔离器所用密钥数据信息
+
+
+
+
+
+
+
+ { }} /> +
+
+ { }} /> +
+ setHtmlText('')} /> +
+
+
); -} +} \ No newline at end of file diff --git a/src/pages/GLQ/index.less b/src/pages/GLQ/index.less index 6f84444..e474196 100644 --- a/src/pages/GLQ/index.less +++ b/src/pages/GLQ/index.less @@ -12,49 +12,22 @@ justify-content: flex-end; } -.bottom_warp { +.erroInfo { position: absolute; - bottom: 0; - width: 100%; - height: 140px; - background: #FFFFFF; - border-radius: 2px 0px 0px 0px; - opacity: 0.8; - border-top: 1px solid #D8D8D8; - display: flex; - align-items: center; - justify-content: space-between; + bottom: 20px; + left: 20px; + height: 32px; + line-height: 32px; + color: red; } -.item_con { - width: 50%; - height: 100%; - display: flex; - - ._img { - width: 54px; - height: 54px; - margin: 20px; - background-color: saddlebrown; - } - - .item_info { - &:nth-child(2), &:nth-child(3) { - height: 22px; - font-size: 14px; - font-weight: 400; - color: #333333; - line-height: 22px; - } - } - - .item_title { - margin-top: 34px; - height: 26px; - line-height: 26px; - font-size: 16px; - font-weight: 600; - color: #333333; - margin-bottom: 10px; - } +.html_con { + background: #FFFFFF; + box-shadow: inset 4px 4px 1px 0px rgba(35, 44, 48, 0.32); + border-radius: 1px; + border: 1px solid #E3E3E3; + width: 100%; + height: 330px; + overflow: hidden; + overflow-y: auto; } \ No newline at end of file