{
history.replace('/');
}}
>
-
-
@@ -137,6 +137,7 @@ const MenuBar: React.FC
+ 
+ {getStoreBusinessInfo()?.name}
{
+ history.replace('/');
+ }}
+ >
+
+ 返回平台首页
+
+ 拖拽文件到这里，或
+ 点此添加
+
+ }
+ description=""
+ icon={}
name="projectFilePath"
action="/api/v1/file/uploadFile"
max={1}
fieldProps={{
+ className: 'gn_proFormUploadDragger_formItem',
name: 'file',
// beforeUpload: beforeUploadFile,
data: { path: `models/${Date.now()}` },
@@ -322,7 +331,9 @@ const CreateForm: React.FC请上传格式为zip.tar.gz的业务代码文件
+
+ 请上传格式为zip.tar.gz的模型文件
+
{' '}
{/* 参数配置 */}
+ 拖拽文件到这里，或
+ 点此添加
+
+ }
+ description=""
+ icon={}
value={fileList}
name="dragger"
fieldProps={{
+ className: 'gn_proFormUploadDragger_formItem',
onChange: handleFileChange,
onRemove: () => {
let index_ids = actionFormListRef.current?.getList()?.map((v, i) => {
@@ -418,16 +438,18 @@ const CreateForm: React.FC
+ 请上传格式为zip.tar.gz的模型文件
+
{/* // TODO label字重与上面统一, 操作按钮需要与输入框对齐 */}
+
暂未上传模型配置文件，可根据业务需求手动添加参数字段~
-
+
}
actionRef={actionFormListRef}
@@ -439,8 +461,8 @@ const CreateForm: React.FC
+
= ({ info, detailOpen,
defaultMessage="硬件信息"
/>
-
-
+
-
- -{v.label}-- ++{fetchAnimatePicByType()}++- - ); - })} - + + ); + })} + +
-
+ {info?.progressData?.map((v, k) => {
+ return (
+
-
+ +-{v.label}++ +
-
+
-
- -{v.label}-- ++{fetchAnimatePicByType()}++- - ); - })} - + + ); + })} + +
-
+ {info?.progressData?.map((v, k) => {
+ return (
+
-
+ +-{v.label}++ +
-
+
-
{detailOpen &&
info?.progressData?.map((item, index) => {
return (
@@ -322,7 +324,7 @@ const DetailServerState: React.FC
+
className="gn_pro_list"
itemLayout="vertical"
diff --git a/src/pages/Business/BusinessState/components/deviceStateCard.tsx b/src/pages/Business/BusinessState/components/deviceStateCard.tsx
index a2bb876..b1a36b8 100644
--- a/src/pages/Business/BusinessState/components/deviceStateCard.tsx
+++ b/src/pages/Business/BusinessState/components/deviceStateCard.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-08 16:57:30
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-11 09:33:08
+ * @LastEditTime: 2024-05-22 16:20:13
* @FilePath: \general-ai-manage\src\pages\Business\BusinessState\components\deviceStateCard.tsx
* @Description: 设备状态项卡片
*/
@@ -10,7 +10,10 @@ import { AnimatePic } from '@/components/Animate';
import TableActionCard, { actionsProps } from '@/components/TableActionCard';
import { deviceStateEnums } from '@/enums/device';
import { Progress } from 'antd';
-import json01 from '../../../../../public/animate/device/01.json'; //引入下载的动效json
+import errorAnimateJson from '../../../../../public/animate/device/error.json'; //引入下载的动效json
+import onlineAnimateJson from '../../../../../public/animate/device/online.json'; //引入下载的动效json
+
+import outlineSvg from '../../../../../public/animate/device/outline.svg';
type DeviceStateCardProps = {
info: Record;
@@ -23,57 +26,71 @@ const DeviceStateCard: React.FC = ({ info, renderActions,
return deviceStateEnums.find((item: DICTENUM.DICT_TAB_ITEM) => item.key === record);
};
+ // 动效类型
+ const fetchAnimatePicByType = () => {
+ switch (info?.state) {
+ case '1':
+ case '3':
+ return 
;
+ }
+ };
+
return (
{
console.log('服务器详情展示');
fetchDetail();
}}
- className={`bs_card_box ${formatStateByVal(info?.state)?.className}`}
+ className={`bs_card_box`}
>
-
-
-
{info?.name}
-
- {formatStateByVal(info?.state)?.label}
+
+
-
+
-
-
+
+
+ {info?.name}
+
+ {formatStateByVal(info?.state)?.label}
+
- ;
renderActions: actionsProps[];
@@ -23,55 +23,65 @@ const ServerStateCard: React.FC = ({ info, renderActions,
return serverStateEnums.find((item: DICTENUM.DICT_TAB_ITEM) => item.key === record);
};
+ // 动效类型
+ const fetchAnimatePicByType = () => {
+ switch (info?.state) {
+ case '1':
+ return
-
-
-
diff --git a/src/pages/Business/BusinessState/components/serverStateCard.tsx b/src/pages/Business/BusinessState/components/serverStateCard.tsx
index 2b31d64..cd07b4b 100644
--- a/src/pages/Business/BusinessState/components/serverStateCard.tsx
+++ b/src/pages/Business/BusinessState/components/serverStateCard.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-08 16:57:30
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-10 14:25:55
+ * @LastEditTime: 2024-05-22 16:20:48
* @FilePath: \general-ai-manage\src\pages\Business\BusinessState\components\serverStateCard.tsx
* @Description: 服务器状态项卡片
*/
@@ -10,8 +10,8 @@ import { AnimatePic } from '@/components/Animate';
import TableActionCard, { actionsProps } from '@/components/TableActionCard';
import { serverStateEnums } from '@/enums/server';
import { Progress } from 'antd';
-import json01 from '../../../../../public/animate/device/01.json'; //引入下载的动效json
-
+import onlineAnimateJson from '../../../../../public/animate/serves/online.json'; //引入下载的动效json
+import outlineSvg from '../../../../../public/animate/serves/outline.svg';
type ServerStateCardProps = {
info: Record-
- {info?.progressData?.map((v, k) => {
- return (
-
{
console.log('服务器详情展示');
fetchDetail();
}}
- className={`bs_card_box ${formatStateByVal(info?.state)?.className}`}
+ className={`bs_card_box `}
>
-
-
-
{info?.deviceSort}
-
- {formatStateByVal(info?.state).label}
+
+
-
+
-
-
+
+
+ {info?.deviceSort}
+
+ {formatStateByVal(info?.state).label}
+
- []>([]); // 列表数据
const [currentRow, setCurrentRow] = useState>();
- const [currentPageSize, setCurrentPageSize] = useState(12);
+ const [currentPageSize, setCurrentPageSize] = useState(20);
const [currentPage, setCurrentPage] = useState(1);
const [total, setTotal] = useState(1);
@@ -181,7 +181,7 @@ const DeviceSate: React.FC = () => {
layout="horizontal"
submitter={{
render: () => (
-
-
-
-
diff --git a/src/pages/Business/BusinessState/deviceSate.tsx b/src/pages/Business/BusinessState/deviceSate.tsx
index a980698..77ebe3a 100644
--- a/src/pages/Business/BusinessState/deviceSate.tsx
+++ b/src/pages/Business/BusinessState/deviceSate.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-05-10 10:47:45
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-15 15:35:20
+ * @LastEditTime: 2024-05-22 11:14:05
* @FilePath: \general-ai-platform-web\src\pages\Business\BusinessState\deviceSate.tsx
* @Description: 设备状态列表
* @交互说明
@@ -33,7 +33,7 @@ const DeviceSate: React.FC = () => {
// 列表
const [serverList, setServerList] = useState-
- {info?.progressData?.map((v, k) => {
- return (
-
+
{
changeTabMode(key);
}}
>
-
+
className="gn_pro_list"
ghost={true}
diff --git a/src/pages/Business/BusinessState/index.less b/src/pages/Business/BusinessState/index.less
index 8f9112a..2fc520c 100644
--- a/src/pages/Business/BusinessState/index.less
+++ b/src/pages/Business/BusinessState/index.less
@@ -1,10 +1,23 @@
/* 服务器 设备 共用 */
@import url('@/base.less');
.bs_state_page {
+ .ant-pro-list-row-card {
+ padding-inline: 0;
+ }
+ .ant-pro-checkcard {
+ margin-block-end: 0;
+ }
+ // bs_card_body bs_card_box
.bs_card_box {
width: 100%;
+ padding: 0px 4px 16px 8px;
+ }
+ .bs_card_body {
+ width: 100%;
+ overflow: hidden;
background: #f4f8fe;
-
+ border-radius: 4px;
+ box-shadow: inset 0px -2px 0px 0px rgba(21, 77, 221, 0.2);
.bs_card_header {
background: linear-gradient(90deg, #d5e6fe 0%, rgba(213, 230, 254, 0) 100%);
.bs_card_name {
@@ -15,9 +28,6 @@
&.outline_info {
.gray_info_all();
background: #f5f5f5;
- // .bs_card_header {
- // background: linear-gradient(90deg, #dcdcdc 0%, rgba(245, 245, 245, 0) 100%);
- // }
}
// 在线
// &.online_info {
diff --git a/src/pages/Business/BusinessState/index.tsx b/src/pages/Business/BusinessState/index.tsx
index 60d6ca5..6720d64 100644
--- a/src/pages/Business/BusinessState/index.tsx
+++ b/src/pages/Business/BusinessState/index.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-05-07 13:38:03
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-15 16:30:02
+ * @LastEditTime: 2024-05-22 16:45:57
* @FilePath: \general-ai-platform-web\src\pages\Business\BusinessState\index.tsx
* @Description: 设备服务器状态 一级关键词 businessState（bs）
* @交互说明
@@ -29,7 +29,7 @@ const BusinessState: React.FC = () => {
// 列表
const [serverList, setServerList] = useState[]>([]); // 列表数据
const [currentRow, setCurrentRow] = useState>();
- const [currentPageSize, setCurrentPageSize] = useState(12);
+ const [currentPageSize, setCurrentPageSize] = useState(20);
const [currentPage, setCurrentPage] = useState(1);
const [total, setTotal] = useState(1);
const [createModalOpen, setCreateModalOpen] = useState(false);
@@ -176,7 +176,7 @@ const BusinessState: React.FC = () => {
changeTabMode(key);
}}
>
- = (props) => {
{() => {
return (
<>
- = () => {
toBack={() => {
setIsSettingOpen(false);
}}
- size={14}
+ size={16}
title="模型列表"
>
= ({ info, detailOpen,
setSelectedRows(selectedRowsData);
},
}}
- tableAlertOptionRender={() => {
- return <>{selectedRows?.length > 0 && <>};
- }}
+ tableAlertRender={false}
request={async () => {
let resp = await getAllDeviceList();
console.log(resp, 'getAllDeviceList_resp');
diff --git a/src/pages/Business/DeviceGroup/components/modelSetting.tsx b/src/pages/Business/DeviceGroup/components/modelSetting.tsx
index d46a2bd..3169319 100644
--- a/src/pages/Business/DeviceGroup/components/modelSetting.tsx
+++ b/src/pages/Business/DeviceGroup/components/modelSetting.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-30 10:02:29
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-15 14:24:43
+ * @LastEditTime: 2024-05-21 15:26:02
* @FilePath: \general-ai-platform-web\src\pages\Business\DeviceGroup\components\modelSetting.tsx
* @Description: 业务模型部署
* @交互说明
@@ -48,6 +48,7 @@ const ModelSetting: React.FC = () => {
hideInSearch: true,
key: 'fixedName',
fixed: 'left',
+ width: '30%',
},
{
title: {
- setNodeInfo(record);
+ // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+ record?.id && setNodeInfo(record);
}}
addTreeNode={(node) => {
//TODO 判断是根节点还是子节点 调用新增接口
@@ -82,7 +83,7 @@ const DeviceGroup: React.FC = () => {
}}
selectTree={(selectedKeys, info) => {
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
- info?.node && setNodeInfo(info?.node);
+ info?.node && info?.node?.id && setNodeInfo(info?.node);
// handleSelectNode(selectedKeys, info)
console.log('selectTree_selected', selectedKeys, info);
}}
diff --git a/src/pages/Model/ModelDetail/components/createForm.tsx b/src/pages/Model/ModelDetail/components/createForm.tsx
index df06d35..cac2ea9 100644
--- a/src/pages/Model/ModelDetail/components/createForm.tsx
+++ b/src/pages/Model/ModelDetail/components/createForm.tsx
@@ -97,6 +97,11 @@ const CreateForm: React.FC = (props) => {
+ onFinish={async (values) => {
+ console.log('All form values:', values);
+ // 在这里处理提交数据，例如调用API
+ message.success('提交成功');
+ }}
stepsProps={proFormStepsFormProps.stepsProps}
current={current}
onCurrentChange={setCurrent}
@@ -392,7 +397,7 @@ const CreateForm: React.FC = (props) => {
{/* // TODO label字重与上面统一, 操作按钮需要与输入框对齐 */}
模型参数
diff --git a/src/pages/Model/ModelDetail/index.tsx b/src/pages/Model/ModelDetail/index.tsx
index 8cca479..acb92f8 100644
--- a/src/pages/Model/ModelDetail/index.tsx
+++ b/src/pages/Model/ModelDetail/index.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-08 10:36:06
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-20 11:10:22
+ * @LastEditTime: 2024-05-21 09:17:25
* @FilePath: \general-ai-manage\src\pages\Model\ModelDetail\index.tsx
* @Description: 模型详情（基础信息展示、模型版本列表）
* @交互说明
@@ -221,7 +221,7 @@ const ModelDetail: React.FC = () => {
bodyStyle={{ padding: 0, margin: 0, backgroundColor: 'transparent' }}
>
+
{
@@ -187,7 +187,7 @@ const BusinessState: React.FC = () => {
}
>
- = (props) => {
>
= (props) => {
]}
/>
= (props) => {
},
]}
/>
-
+ buttonLabel={
{openFiles ? (
= (props) => {
width={proFormSmallItemStyleProps.width}
max={1}
label={模型文件上传}
+ title={
+ = (props) => {
},
}}
/>
+
- {' '}
模型参数
-
}
actionRef={actionFormListRef}
@@ -498,8 +528,8 @@ const CreateModelParams: React.FC
+
className="gn_pro_list"
ghost={true}
diff --git a/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx b/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx
index 7ae3945..1cddb40 100644
--- a/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx
+++ b/src/pages/Business/DeviceGroup/components/alarmSetForm.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-30 10:02:29
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-15 15:11:00
+ * @LastEditTime: 2024-05-21 16:12:06
* @FilePath: \general-ai-platform-web\src\pages\Business\DeviceGroup\components\alarmSetForm.tsx
* @Description: 告警设置
* @交互说明
@@ -34,6 +34,7 @@ const AlarmSetForm: React.FC = (props) => {
}, []);
return (
= (props) => {
}}
>
-
+
= (props) => {
label={
= (props) => {
return true;
}}
>
- {/* // TODO 上传文案需要和UI稿对比 */}
+ 拖拽文件到这里，或
+ 点此添加
+
+ }
+ description=""
+ icon={}
max={1}
label={配置文件上传}
value={fileList}
name="dragger"
fieldProps={{
+ className: 'gn_proFormUploadDragger_formItem',
onChange: handleFileChange,
onRemove: () => {
let index_ids = actionFormListRef.current?.getList()?.map((v, i) => {
@@ -225,17 +234,19 @@ const CreateModelParams: React.FC = (props) => {
},
}}
/>
+
- {' '}
模型参数
-
}
actionRef={actionFormListRef}
@@ -278,7 +289,7 @@ const CreateModelParams: React.FC
+ 请上传格式为zip.tar.gz的模型文件
+
{/* // TODO label字重与上面统一, 操作按钮需要与输入框对齐 */}
+
暂未上传模型配置文件，可根据业务需求手动添加参数字段~
-
+
+ 拖拽文件到这里，或
+ 点此添加
+
+ }
+ description=""
+ icon={}
value={fileList}
name="dragger"
fieldProps={{
+ className: 'gn_proFormUploadDragger_formItem',
onChange: handleFileChange,
onRemove: () => {
let index_ids = actionFormListRef.current?.getList()?.map((v, i) => {
@@ -478,15 +504,19 @@ const CreateModelParams: React.FC
+ 请上传格式为zip.tar.gz的模型文件
+
{/* // TODO label字重与上面统一, 操作按钮需要与输入框对齐 */}
暂未上传模型文件，可根据业务需求手动添加参数字段~
+
+ 暂未上传模型文件，可根据业务需求手动添加参数字段~
+
+
= (props) => {
/>
= (props) => {
]}
/>
= (props) => {
width: '52px',
height: '32px',
marginTop: '30px',
+ marginLeft: '-4px',
borderRadius: '4px',
+ borderColor: '#154ddd',
+ color: '#154ddd',
}}
onClick={() => {
const { ip, port } = form.getFieldsValue();
diff --git a/src/pages/Project/BusinessInfo/index.css b/src/pages/Project/BusinessInfo/index.css
index 1432c99..766ee2d 100644
--- a/src/pages/Project/BusinessInfo/index.css
+++ b/src/pages/Project/BusinessInfo/index.css
@@ -9,3 +9,7 @@
background: linear-gradient(180deg, #21c7ff 0%, #428cff 100%);
border-radius: 2px;
}
+.businessInfo_page .baseInfo_box img {
+ width: 80px;
+ height: 80px;
+}
diff --git a/src/pages/Project/BusinessInfo/index.less b/src/pages/Project/BusinessInfo/index.less
index 1aedec8..05849ca 100644
--- a/src/pages/Project/BusinessInfo/index.less
+++ b/src/pages/Project/BusinessInfo/index.less
@@ -12,4 +12,11 @@
border-radius: 2px;
}
}
+
+ .baseInfo_box {
+ img {
+ width: 80px;
+ height: 80px;
+ }
+ }
}
diff --git a/src/pages/Project/BusinessInfo/index.tsx b/src/pages/Project/BusinessInfo/index.tsx
index 4a7fc9e..9f10d76 100644
--- a/src/pages/Project/BusinessInfo/index.tsx
+++ b/src/pages/Project/BusinessInfo/index.tsx
@@ -13,6 +13,7 @@ import { getBusinessAlgorithmList, getBusinessDetail } from '@/services/testApi/
import { isSuccessApi } from '@/utils/forApi';
import { ProCard, ProList } from '@ant-design/pro-components';
import { Button } from 'antd';
+import businessLogoIcon from '/public/home/business_logo.svg';
import React, { useEffect, useState } from 'react';
import { proTablePaginationOptions } from '../../../../config/defaultTable';
@@ -23,7 +24,6 @@ import BaseInfo from './components/baseInfo';
import UpdateForm from './components/updateForm';
import './index.less';
-import { ReactComponent as YaxinshijueIcon } from '/public/home/yaxinshijue_icon.svg';
// eslint-disable-next-line react-hooks/rules-of-hooks
const { formatTimeByDateType } = useMoment();
@@ -120,12 +120,12 @@ const BusinessInfo: React.FC = () => {
}
>
-
+
{/* // TODO 替换使用公司的logo字段 */}
-
+
+
{detailInfo?.name}
-
className="gn_pro_list"
ghost={true}
itemCardProps={{
ghost: true,
- bodyStyle: { padding: 0, margin: 0 },
+ bodyStyle: {
+ padding: 0,
+ margin: 0,
+ },
style: {
width: '100%',
border: 0,
diff --git a/src/pages/Project/BusinessProject/index.tsx b/src/pages/Project/BusinessProject/index.tsx
index feafad3..af72209 100644
--- a/src/pages/Project/BusinessProject/index.tsx
+++ b/src/pages/Project/BusinessProject/index.tsx
@@ -2,7 +2,7 @@
* @Author: donghao donghao@supervision.ltd
* @Date: 2024-04-07 14:02:00
* @LastEditors: donghao donghao@supervision.ltd
- * @LastEditTime: 2024-05-17 16:25:17
+ * @LastEditTime: 2024-05-22 10:07:55
* @FilePath: \general-ai-manage\src\pages\BusinessProject\BusinessProject.tsx
* @Description: 企业项目首页
* @交互说明
@@ -268,7 +268,7 @@ const BusinessProject: React.FC = () => {
/>
-
+
@@ -146,12 +146,19 @@ const BusinessInfo: React.FC = () => {
className="gn_card_wrap pb-[16px]"
title={企业算法({total})}
>
+ {/* bodyStyle={{
+ maxHeight: 'calc(100vh - 730px)',
+ overflowY: 'scroll',
+ }} */}
注册时间: {formatTimeByDateType(detailInfo?.create_time)}
+
className="gn_pro_list"
ghost={true}
diff --git a/src/pages/User/Login/index.tsx b/src/pages/User/Login/index.tsx
index a955ec3..3ab2cc4 100644
--- a/src/pages/User/Login/index.tsx
+++ b/src/pages/User/Login/index.tsx
@@ -5,6 +5,7 @@ import { getAllRouteNameTile, replaceMenuWithRoutesData } from '@/utils/common';
import { getLocale } from '@@/exports';
import { addLocale } from '@@/plugin-locale';
import { innerMenuRoutes } from '../../../../config/routes';
+import businessBigLogo from '/public/home/business_big_logo.svg';
import { LockOutlined, UserOutlined } from '@ant-design/icons';
import {
@@ -244,7 +245,17 @@ const Login: React.FC = () => {
},
},
}}
- title="欢迎登录"
+ title={
+
diff --git a/src/pages/User/Login/login.css b/src/pages/User/Login/login.css
index 050c8fa..5f830a3 100644
--- a/src/pages/User/Login/login.css
+++ b/src/pages/User/Login/login.css
@@ -1,3 +1,10 @@
+.ant-pro-form-login-page-left {
+ width: 100%;
+ max-width: 100%;
+}
+.ant-pro-form-login-page-notice {
+ display: none;
+}
.loginFrom .loginBox {
display: flex;
align-items: center;
@@ -8,6 +15,12 @@
background-repeat: no-repeat;
background-size: 100% 100%;
}
+.loginFrom .login_title_box .login_logo {
+ padding-bottom: 12px;
+}
+.loginFrom .login_title_box .login_logo img {
+ width: 160px;
+}
.loginFrom .loginRight {
display: flex;
align-items: center;
@@ -16,39 +29,27 @@
height: 100%;
}
.loginFrom .loginRight .ant-pro-form-login-page-container {
- position: fixed;
- top: 50%;
- left: 50%;
- margin-left: -248px;
- margin-top: -283px;
+ height: auto !important;
+ padding: 48px 40px !important;
+ background-color: #ffffff;
border-radius: 16px;
- background-color: rgba(255, 255, 255, 0.6);
}
-.loginFrom .loginRight .ant-pro-form-login-page-title {
- padding-bottom: 32px;
-}
-.loginFrom .ant-pro-form-login-container .ant-pro-form-login-title {
- padding-bottom: 32px;
+.loginFrom .loginRight .ant-pro-form-login-page-main {
+ width: 100%;
}
-.loginFrom :global .ant-pro-form-login-container {
- background: red;
+.loginFrom .loginRight .ant-form-item:nth-of-type(2) {
+ margin-bottom: 16px;
}
-.loginFrom :global .ant-pro-form-login-container .ant-pro-form-login-top .css-dev-only-do-not-override-1lxmgnh {
- width: 400px;
- margin-bottom: 32px;
- font-weight: 400;
+.loginFrom .loginRight .ant-form-item .ant-input-affix-wrapper {
+ height: 48px;
+ border-radius: 4px;
}
-.loginFrom :global .ant-pro-form-login-container :where(.css-dev-only-do-not-override-1lxmgnh).ant-pro-form-login-main {
- min-width: 400px;
- max-width: 580px;
- margin: 0;
+.loginFrom .loginRight .ant-btn-primary {
+ margin-top: 16px;
}
-.loginFrom :global .ant-pro-form-login-container .ant-pro-form-login-main .css-dev-only-do-not-override-1lxmgnh {
- width: 400px;
+.loginFrom .loginRight .ant-pro-form-login-page-title {
+ padding-bottom: 32px;
}
-.loginFrom :global .ant-pro-form-login-container :where(.css-dev-only-do-not-override-qgg3xn).ant-input-affix-wrapper-lg {
- padding: 7px 11px;
- font-size: 16px;
- line-height: 1.5;
- border-radius: 4px;
+.loginFrom .ant-pro-form-login-container .ant-pro-form-login-title {
+ padding-bottom: 32px;
}
diff --git a/src/pages/User/Login/login.less b/src/pages/User/Login/login.less
index 157df20..6062b91 100644
--- a/src/pages/User/Login/login.less
+++ b/src/pages/User/Login/login.less
@@ -1,3 +1,12 @@
+@import url('@/base.less');
+
+.ant-pro-form-login-page-left {
+ width: 100%;
+ max-width: 100%;
+}
+.ant-pro-form-login-page-notice {
+ display: none;
+}
.loginFrom {
.loginBox {
display: flex;
@@ -36,6 +45,15 @@
// }
// }
+ .login_title_box {
+ .login_logo {
+ img {
+ width: 160px;
+ }
+ padding-bottom: 12px;
+ }
+ }
+
.loginRight {
display: flex;
align-items: center;
@@ -43,14 +61,38 @@
width: 100%;
height: 100%;
.ant-pro-form-login-page-container {
- position: fixed;
- top: 50%;
- left: 50%;
- margin-top: -283px;
- margin-left: -248px;
- background-color: rgba(255, 255, 255, 0.6);
+ height: auto !important;
+ padding: 48px 40px !important;
+ background-color: rgba(255, 255, 255, 1);
border-radius: 16px;
}
+
+ .ant-pro-form-login-page-main {
+ width: 100%;
+ }
+ .ant-form-item {
+ &:nth-of-type(2) {
+ margin-bottom: 16px;
+ }
+ .ant-input-affix-wrapper {
+ height: 48px;
+ border-radius: 4px;
+ }
+ }
+ .ant-btn-primary {
+ margin-top: 16px;
+ background-color: @primary_color !important;
+ }
+
+ .ant-checkbox-wrapper:not(.ant-checkbox-wrapper-disabled):hover
+ .ant-checkbox-checked:not(.ant-checkbox-disabled)
+ .ant-checkbox-inner {
+ background-color: @primary_color !important;
+ }
+ .ant-input-outlined:hover {
+ border-color: @primary_color !important;
+ }
+
.ant-pro-form-login-page-title {
padding-bottom: 32px;
}
@@ -67,28 +109,28 @@
padding-bottom: 32px;
}
}
- :global {
- .ant-pro-form-login-container {
- background: red;
- .ant-pro-form-login-top .css-dev-only-do-not-override-1lxmgnh {
- width: 400px;
- margin-bottom: 32px;
- font-weight: 400;
- }
- :where(.css-dev-only-do-not-override-1lxmgnh).ant-pro-form-login-main {
- min-width: 400px;
- max-width: 580px;
- margin: 0;
- }
- .ant-pro-form-login-main .css-dev-only-do-not-override-1lxmgnh {
- width: 400px;
- }
- :where(.css-dev-only-do-not-override-qgg3xn).ant-input-affix-wrapper-lg {
- padding: 7px 11px;
- font-size: 16px;
- line-height: 1.5;
- border-radius: 4px;
- }
- }
- }
+ // :global {
+ // .ant-pro-form-login-container {
+ // background: red;
+ // .ant-pro-form-login-top .css-dev-only-do-not-override-1lxmgnh {
+ // width: 400px;
+ // margin-bottom: 32px;
+ // font-weight: 400;
+ // }
+ // :where(.css-dev-only-do-not-override-1lxmgnh).ant-pro-form-login-main {
+ // min-width: 400px;
+ // max-width: 580px;
+ // margin: 0;
+ // }
+ // .ant-pro-form-login-main .css-dev-only-do-not-override-1lxmgnh {
+ // width: 400px;
+ // }
+ // :where(.css-dev-only-do-not-override-qgg3xn).ant-input-affix-wrapper-lg {
+ // padding: 7px 11px;
+ // font-size: 16px;
+ // line-height: 1.5;
+ // border-radius: 4px;
+ // }
+ // }
+ // }
}
+
+ }
initialValues={
{
// autoLogin: false,
@@ -345,10 +356,10 @@ const Login: React.FC = () => {
- 忘记密码
+ 忘记密码?
+ 
+ {/*
+
+ 智能制造公共服务平台
+
+