diff --git a/react-ui/config/config.ts b/react-ui/config/config.ts index 04ab330d..f64c8c77 100644 --- a/react-ui/config/config.ts +++ b/react-ui/config/config.ts @@ -75,7 +75,7 @@ export default defineConfig({ * @name layout 插件 * @doc https://umijs.org/docs/max/layout-menu */ - title: '智能材料科研平台', + title: '复杂智能软件', layout: { ...defaultSettings, }, diff --git a/react-ui/config/defaultSettings.ts b/react-ui/config/defaultSettings.ts index c4c59d2f..306c89db 100644 --- a/react-ui/config/defaultSettings.ts +++ b/react-ui/config/defaultSettings.ts @@ -17,7 +17,7 @@ const Settings: ProLayoutProps & { fixSiderbar: false, splitMenus: false, colorWeak: false, - title: '智能材料科研平台', + title: '复杂智能软件', pwa: true, token: { // 参见ts声明,demo 见文档,通过token 修改样式 diff --git a/react-ui/config/routes.ts b/react-ui/config/routes.ts index 578d2474..eaddb001 100644 --- a/react-ui/config/routes.ts +++ b/react-ui/config/routes.ts @@ -44,7 +44,7 @@ export default [ { name: 'login', path: '/user/login', - component: './User/Login', + component: './User/Login/login', }, ], }, diff --git a/react-ui/public/CNAME b/react-ui/public/CNAME deleted file mode 100644 index 30c2d4d3..00000000 --- a/react-ui/public/CNAME +++ /dev/null @@ -1 +0,0 @@ -preview.pro.ant.design \ No newline at end of file diff --git a/react-ui/public/favicon-cl.ico b/react-ui/public/favicon-cl.ico new file mode 100644 index 00000000..408b8a23 Binary files /dev/null and b/react-ui/public/favicon-cl.ico differ diff --git a/react-ui/public/favicon.ico b/react-ui/public/favicon.ico index 408b8a23..4d544cb1 100644 Binary files a/react-ui/public/favicon.ico and b/react-ui/public/favicon.ico differ diff --git a/react-ui/public/logo.svg b/react-ui/public/logo.svg deleted file mode 100644 index 239bf69f..00000000 --- a/react-ui/public/logo.svg +++ /dev/null @@ -1 +0,0 @@ -Group 28 Copy 5Created with Sketch. \ No newline at end of file diff --git a/react-ui/public/pro_icon.svg b/react-ui/public/pro_icon.svg deleted file mode 100644 index e075b78d..00000000 --- a/react-ui/public/pro_icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/react-ui/src/assets/img/logo-cl.png b/react-ui/src/assets/img/logo-cl.png new file mode 100644 index 00000000..e2fbcfe5 Binary files /dev/null and b/react-ui/src/assets/img/logo-cl.png differ diff --git a/react-ui/src/assets/img/logo.png b/react-ui/src/assets/img/logo.png index e2fbcfe5..cae91fe5 100644 Binary files a/react-ui/src/assets/img/logo.png and b/react-ui/src/assets/img/logo.png differ diff --git a/react-ui/src/components/RightContent/AvatarDropdown.tsx b/react-ui/src/components/RightContent/AvatarDropdown.tsx index d93d4f74..9efc837a 100644 --- a/react-ui/src/components/RightContent/AvatarDropdown.tsx +++ b/react-ui/src/components/RightContent/AvatarDropdown.tsx @@ -1,8 +1,6 @@ import { clearSessionToken } from '@/access'; import { setRemoteMenu } from '@/services/session'; import { logout } from '@/services/system/auth'; -import { ClientInfo } from '@/types'; -import SessionStorage from '@/utils/sessionStorage'; import { gotoLoginPage } from '@/utils/ui'; import { LogoutOutlined, UserOutlined } from '@ant-design/icons'; import { setAlpha } from '@ant-design/pro-components'; @@ -66,11 +64,11 @@ const AvatarDropdown: React.FC = ({ menu }) => { clearSessionToken(); setRemoteMenu(null); gotoLoginPage(); - const clientInfo: ClientInfo = SessionStorage.getItem(SessionStorage.clientInfoKey, true); - if (clientInfo) { - const { logoutUri } = clientInfo; - location.replace(logoutUri); - } + // const clientInfo: ClientInfo = SessionStorage.getItem(SessionStorage.clientInfoKey, true); + // if (clientInfo) { + // const { logoutUri } = clientInfo; + // location.replace(logoutUri); + // } }; const actionClassName = useEmotionCss(({ token }) => { return { diff --git a/react-ui/src/pages/User/Login/login.tsx b/react-ui/src/pages/User/Login/login.tsx index 9ef18148..c22f8be9 100644 --- a/react-ui/src/pages/User/Login/login.tsx +++ b/react-ui/src/pages/User/Login/login.tsx @@ -119,10 +119,10 @@ const Login = () => { draggable={false} alt="" /> - 智能材料科研平台 + 复杂智能软件
- 智能材料科研平台 + 复杂智能软件 {
欢迎登录 - 智能材料科研平台 + 复杂智能软件
账号登录
diff --git a/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less b/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less index 0b9a0ddf..59a0cb5b 100644 --- a/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less +++ b/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less @@ -37,7 +37,7 @@ } &__icon { - width: 363px; - height: 216px; + // width: 363px; + height: 176px; } } diff --git a/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx b/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx index 81ab8f54..f3543705 100644 --- a/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx +++ b/react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx @@ -1,16 +1,14 @@ -import { Button } from 'antd'; import styles from './index.less'; function WorkspaceIntro() { return (
-
自主实验平台
+
复杂智能软件
- 材料领域的自主实验系统是一种用于材料研究和开发的技术平台,它旨在提供实验数据收集、分析和可视化等功能, - 以支持材料工程师、科学家和研究人员在材料设计、性能评估和工艺优化方面的工作 + 复杂智能软件平台构建一套完整的版本迭代升级机制、开发与运行态版本依赖关系分析,以及整合开发部署和持续优化的一体化流程,涵盖数据管理、模型建模、服务开发和系统运行等关键环节,以实现高效、稳定的软件生命周期管理。
-
+ {/*
-
+
*/}