Merge pull request '合并dev-zw' (#167) from dev-zw into dev

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,
   },

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 修改样式

react-ui/config/routes.ts

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

react-ui/public/CNAME

@@ -1 +0,0 @@
-preview.pro.ant.design

react-ui/public/logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200" version="1.1" viewBox="0 0 200 200"><title>Group 28 Copy 5</title><desc>Created with Sketch.</desc><defs><linearGradient id="linearGradient-1" x1="62.102%" x2="108.197%" y1="0%" y2="37.864%"><stop offset="0%" stop-color="#4285EB"/><stop offset="100%" stop-color="#2EC7FF"/></linearGradient><linearGradient id="linearGradient-2" x1="69.644%" x2="54.043%" y1="0%" y2="108.457%"><stop offset="0%" stop-color="#29CDFF"/><stop offset="37.86%" stop-color="#148EFF"/><stop offset="100%" stop-color="#0A60FF"/></linearGradient><linearGradient id="linearGradient-3" x1="69.691%" x2="16.723%" y1="-12.974%" y2="117.391%"><stop offset="0%" stop-color="#FA816E"/><stop offset="41.473%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient><linearGradient id="linearGradient-4" x1="68.128%" x2="30.44%" y1="-35.691%" y2="114.943%"><stop offset="0%" stop-color="#FA8E7D"/><stop offset="51.264%" stop-color="#F74A5C"/><stop offset="100%" stop-color="#F51D2C"/></linearGradient></defs><g id="Page-1" fill="none" fill-rule="evenodd" stroke="none" stroke-width="1"><g id="logo" transform="translate(-20.000000, -20.000000)"><g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)"><g id="Group-27-Copy-3"><g id="Group-25" fill-rule="nonzero"><g id="2"><path id="Shape" fill="url(#linearGradient-1)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C99.2571609,26.9692191 101.032305,26.9692191 102.20193,28.1378823 L129.985225,55.8983314 C134.193707,60.1033528 141.017005,60.1033528 145.225487,55.8983314 C149.433969,51.69331 149.433969,44.8756232 145.225487,40.6706018 L108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/><path id="Shape" fill="url(#linearGradient-2)" d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C100.999864,25.6271836 105.751642,20.541824 112.729652,19.3524487 C117.915585,18.4685261 123.585219,20.4140239 129.738554,25.1889424 C125.624663,21.0784292 118.571995,14.0340304 108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z"/></g><path id="Shape" fill="url(#linearGradient-3)" d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.83187 149.47715,131.649557 153.685633,135.854579 Z"/></g><ellipse id="Combined-Shape" cx="100.519" cy="100.437" fill="url(#linearGradient-4)" rx="23.6" ry="23.581"/></g></g></g></g></svg>

react-ui/public/pro_icon.svg

@@ -1,5 +0,0 @@
-<svg width="42" height="42" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <path fill="#070707" d="m6.717392,13.773912l5.6,0c2.8,0 4.7,1.9 4.7,4.7c0,2.8 -2,4.7 -4.9,4.7l-2.5,0l0,4.3l-2.9,0l0,-13.7zm2.9,2.2l0,4.9l1.9,0c1.6,0 2.6,-0.9 2.6,-2.4c0,-1.6 -0.9,-2.4 -2.6,-2.4l-1.9,0l0,-0.1zm8.9,11.5l2.7,0l0,-5.7c0,-1.4 0.8,-2.3 2.2,-2.3c0.4,0 0.8,0.1 1,0.2l0,-2.4c-0.2,-0.1 -0.5,-0.1 -0.8,-0.1c-1.2,0 -2.1,0.7 -2.4,2l-0.1,0l0,-1.9l-2.7,0l0,10.2l0.1,0zm11.7,0.1c-3.1,0 -5,-2 -5,-5.3c0,-3.3 2,-5.3 5,-5.3s5,2 5,5.3c0,3.4 -1.9,5.3 -5,5.3zm0,-2.1c1.4,0 2.2,-1.1 2.2,-3.2c0,-2 -0.8,-3.2 -2.2,-3.2c-1.4,0 -2.2,1.2 -2.2,3.2c0,2.1 0.8,3.2 2.2,3.2z" class="st0" id="Ant-Design-Pro"/>
- </g>
-</svg>

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<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 {

react-ui/src/pages/User/Login/login.tsx

@@ -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>

react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less

@@ -37,7 +37,7 @@
   }
 
   &__icon {
-    width: 363px;
-    height: 216px;
+    // width: 363px;
+    height: 176px;
   }
 }

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 (
     <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' }}
@@ -40,7 +38,7 @@ function WorkspaceIntro() {
           >
             分子材料自主实验系统
           </Button>
-        </div>
+        </div> */}
       </div>
       <div className={styles['workspace-intro__right']}>
         <img