Browse Source

chore: 改回材料平台

pull/171/head
cp3hnu 11 months ago
parent
commit
cdee50eb5f
16 changed files with 23 additions and 19 deletions
  1. +1
    -1
      react-ui/config/config.ts
  2. +1
    -1
      react-ui/config/defaultSettings.ts
  3. +1
    -1
      react-ui/config/routes.ts
  4. +1
    -0
      react-ui/package.json
  5. BIN
      react-ui/public/favicon-cc.ico
  6. BIN
      react-ui/public/favicon-cl.ico
  7. BIN
      react-ui/public/favicon.ico
  8. BIN
      react-ui/src/assets/img/logo-cc.png
  9. BIN
      react-ui/src/assets/img/logo-cl.png
  10. BIN
      react-ui/src/assets/img/logo.png
  11. +2
    -2
      react-ui/src/components/IFramePage/index.tsx
  12. +7
    -5
      react-ui/src/components/RightContent/AvatarDropdown.tsx
  13. +1
    -1
      react-ui/src/iconfont/iconfont-menu.json
  14. +3
    -3
      react-ui/src/pages/User/Login/login.tsx
  15. +0
    -1
      react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less
  16. +6
    -4
      react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx

+ 1
- 1
react-ui/config/config.ts View File

@@ -75,7 +75,7 @@ export default defineConfig({
* @name layout 插件
* @doc https://umijs.org/docs/max/layout-menu
*/
title: '复杂智能软件',
title: '智能材料科研平台',
layout: {
...defaultSettings,
},


+ 1
- 1
react-ui/config/defaultSettings.ts View File

@@ -17,7 +17,7 @@ const Settings: ProLayoutProps & {
fixSiderbar: false,
splitMenus: false,
colorWeak: false,
title: '复杂智能软件',
title: '智能材料科研平台',
pwa: true,
token: {
// 参见ts声明,demo 见文档,通过token 修改样式


+ 1
- 1
react-ui/config/routes.ts View File

@@ -44,7 +44,7 @@ export default [
{
name: 'login',
path: '/user/login',
component: './User/Login/login',
component: process.env.NO_SSO ? './User/Login/login' : './User/Login',
},
],
},


+ 1
- 0
react-ui/package.json View File

@@ -8,6 +8,7 @@
"build": "max build",
"deploy": "npm run build && npm run gh-pages",
"dev": "npm run start:dev",
"dev-no-sso": "NO_SSO=true npm run start:dev",
"docker-hub:build": "docker build -f Dockerfile.hub -t ant-design-pro ./",
"docker-prod:build": "docker-compose -f ./docker/docker-compose.yml build",
"docker-prod:dev": "docker-compose -f ./docker/docker-compose.yml up",


BIN
react-ui/public/favicon-cc.ico View File

Before After

BIN
react-ui/public/favicon-cl.ico View File

Before After

BIN
react-ui/public/favicon.ico View File

Before After

BIN
react-ui/src/assets/img/logo-cc.png View File

Before After
Width: 104  |  Height: 132  |  Size: 9.2 kB

BIN
react-ui/src/assets/img/logo-cl.png View File

Before After
Width: 112  |  Height: 112  |  Size: 5.3 kB

BIN
react-ui/src/assets/img/logo.png View File

Before After
Width: 104  |  Height: 132  |  Size: 9.2 kB Width: 112  |  Height: 112  |  Size: 5.3 kB

+ 2
- 2
react-ui/src/components/IFramePage/index.tsx View File

@@ -1,6 +1,6 @@
import FullScreenFrame from '@/components/FullScreenFrame';
import KFSpin from '@/components/KFSpin';
// import { getLabelStudioUrl } from '@/services/developmentEnvironment';
import { getLabelStudioUrl } from '@/services/developmentEnvironment';
import { to } from '@/utils/promise';
import SessionStorage from '@/utils/sessionStorage';
import classNames from 'classnames';
@@ -18,7 +18,7 @@ export enum IframePageType {
const getRequestAPI = (type: IframePageType): (() => Promise<any>) => {
switch (type) {
case IframePageType.DatasetAnnotation: // 数据标注
return () => Promise.resolve({ code: 200, data: 'http://172.20.32.181:18888/oauth/login' }); //getLabelStudioUrl;
return getLabelStudioUrl;
case IframePageType.AppDevelopment: // 应用开发
return () => Promise.resolve({ code: 200, data: 'http://172.20.32.185:30080/' });
case IframePageType.DevEnv: // 开发环境


+ 7
- 5
react-ui/src/components/RightContent/AvatarDropdown.tsx View File

@@ -1,6 +1,8 @@
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';
@@ -64,11 +66,11 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ 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 {


+ 1
- 1
react-ui/src/iconfont/iconfont-menu.json View File

@@ -1,6 +1,6 @@
{
"id": "4511326",
"name": "复杂智能软件-导航",
"name": "智能材料科研平台-导航",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",


+ 3
- 3
react-ui/src/pages/User/Login/login.tsx View File

@@ -119,10 +119,10 @@ const Login = () => {
draggable={false}
alt=""
/>
复杂智能软件
智能材料科研平台
</div>
<div className={styles['user-login__left__title']}>
<span>复杂智能软件</span>
<span>智能材料科研平台</span>
<img
src={require('@/assets/img/login-ai-logo.png')}
className={styles['user-login__left__title__img']}
@@ -144,7 +144,7 @@ const Login = () => {
<div>
<div className={styles['user-login__right__title']}>
<span style={{ color: '#111111' }}>欢迎登录</span>
<span>复杂智能软件</span>
<span>智能材料科研平台</span>
</div>
<div className={styles['user-login__right__content']}>
<div className={styles['user-login__right__content__title']}>账号登录</div>


+ 0
- 1
react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less View File

@@ -37,7 +37,6 @@
}

&__icon {
// width: 363px;
height: 176px;
}
}

+ 6
- 4
react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx View File

@@ -1,14 +1,16 @@
import { Button } from 'antd';
import styles from './index.less';

function WorkspaceIntro() {
return (
<div className={styles['workspace-intro']}>
<div className={styles['workspace-intro__left']}>
<div className={styles['workspace-intro__title']}>复杂智能软件</div>
<div className={styles['workspace-intro__title']}>自主实验平台</div>
<div className={styles['workspace-intro__content']}>
复杂智能软件平台构建一套完整的版本迭代升级机制、开发与运行态版本依赖关系分析,以及整合开发部署和持续优化的一体化流程,涵盖数据管理、模型建模、服务开发和系统运行等关键环节,以实现高效、稳定的软件生命周期管理。
材料领域的自主实验系统是一种用于材料研究和开发的技术平台,它旨在提供实验数据收集、分析和可视化等功能,
以支持材料工程师、科学家和研究人员在材料设计、性能评估和工艺优化方面的工作
</div>
{/* <div className={styles['workspace-intro__buttons']}>
<div className={styles['workspace-intro__buttons']}>
<Button
type="primary"
style={{ marginRight: '20px' }}
@@ -38,7 +40,7 @@ function WorkspaceIntro() {
>
分子材料自主实验系统
</Button>
</div> */}
</div>
</div>
<div className={styles['workspace-intro__right']}>
<img


Loading…
Cancel
Save