asder

public/vite.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
\ No newline at end of file

src/components/logo/Logo.jsx

-import PropTypes from 'prop-types';
-import { forwardRef } from 'react';
-import { Link as RouterLink } from '@umijs/max';
+import { Link as RouterLink } from "@umijs/max";
+import PropTypes from "prop-types";
+import { forwardRef } from "react";
 // @mui
-import { useTheme } from '@mui/material/styles';
-import { Box, Link } from '@mui/material';
+import { Box, Link } from "@mui/material";
+import { useTheme } from "@mui/material/styles";
 
 // ----------------------------------------------------------------------
 
-const Logo = forwardRef(({ disabledLink = false, sx, ...other }, ref) => {
+const Logo = forwardRef(({ disabledLink = false, sx, link, ...other }, ref) => {
   const theme = useTheme();
 
   const PRIMARY_LIGHT = theme.palette.primary.light;
@@ -31,46 +31,14 @@ const Logo = forwardRef(({ disabledLink = false, sx, ...other }, ref) => {
       ref={ref}
       component="div"
       sx={{
-        width: 40,
-        height: 40,
-        display: 'inline-flex',
+        width: 80,
+        height: 50,
+        display: "inline-flex",
         ...sx,
       }}
       {...other}
     >
-      <svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 512 512">
-        <defs>
-          <linearGradient id="BG1" x1="100%" x2="50%" y1="9.946%" y2="50%">
-            <stop offset="0%" stopColor={PRIMARY_DARK} />
-            <stop offset="100%" stopColor={PRIMARY_MAIN} />
-          </linearGradient>
-
-          <linearGradient id="BG2" x1="50%" x2="50%" y1="0%" y2="100%">
-            <stop offset="0%" stopColor={PRIMARY_LIGHT} />
-            <stop offset="100%" stopColor={PRIMARY_MAIN} />
-          </linearGradient>
-
-          <linearGradient id="BG3" x1="50%" x2="50%" y1="0%" y2="100%">
-            <stop offset="0%" stopColor={PRIMARY_LIGHT} />
-            <stop offset="100%" stopColor={PRIMARY_MAIN} />
-          </linearGradient>
-        </defs>
-
-        <g fill={PRIMARY_MAIN} fillRule="evenodd" stroke="none" strokeWidth="1">
-          <path
-            fill="url(#BG1)"
-            d="M183.168 285.573l-2.918 5.298-2.973 5.363-2.846 5.095-2.274 4.043-2.186 3.857-2.506 4.383-1.6 2.774-2.294 3.939-1.099 1.869-1.416 2.388-1.025 1.713-1.317 2.18-.95 1.558-1.514 2.447-.866 1.38-.833 1.312-.802 1.246-.77 1.18-.739 1.111-.935 1.38-.664.956-.425.6-.41.572-.59.8-.376.497-.537.69-.171.214c-10.76 13.37-22.496 23.493-36.93 29.334-30.346 14.262-68.07 14.929-97.202-2.704l72.347-124.682 2.8-1.72c49.257-29.326 73.08 1.117 94.02 40.927z"
-          />
-          <path
-            fill="url(#BG2)"
-            d="M444.31 229.726c-46.27-80.956-94.1-157.228-149.043-45.344-7.516 14.384-12.995 42.337-25.267 42.337v-.142c-12.272 0-17.75-27.953-25.265-42.337C189.79 72.356 141.96 148.628 95.69 229.584c-3.483 6.106-6.828 11.932-9.69 16.996 106.038-67.127 97.11 135.667 184 137.278V384c86.891-1.611 77.962-204.405 184-137.28-2.86-5.062-6.206-10.888-9.69-16.994"
-          />
-          <path
-            fill="url(#BG3)"
-            d="M450 384c26.509 0 48-21.491 48-48s-21.491-48-48-48-48 21.491-48 48 21.491 48 48 48"
-          />
-        </g>
-      </svg>
+      <img src="./logo.png" alt="" />
     </Box>
   );
 
@@ -79,7 +47,7 @@ const Logo = forwardRef(({ disabledLink = false, sx, ...other }, ref) => {
   }
 
   return (
-    <Link to="/" component={RouterLink} sx={{ display: 'contents' }}>
+    <Link to={"/"} component={RouterLink} sx={{ display: "contents" }}>
       {logo}
     </Link>
   );

src/layouts/dashboard/header/AccountPopover.jsx

 import DraggableDialog from "@/components/DraggableDialog";
 import InitForm from "@/components/InitForm";
 import { doFetch } from "@/utils/doFetch";
-import DownloadIcon from "@mui/icons-material/Download";
 import SettingsIcon from "@mui/icons-material/Settings";
 
 import {
@@ -11,7 +10,6 @@ import {
   MenuItem,
   Popover,
   Stack,
-  Tooltip,
   Typography,
 } from "@mui/material";
 import { useModel, useNavigate } from "@umijs/max";
@@ -192,7 +190,7 @@ export default function AccountPopover() {
           }}
         ></InitForm>
       </DraggableDialog>
-
+      {/* 
       <Tooltip title="下载实训软件">
         <IconButton
           onClick={() => {
@@ -203,7 +201,7 @@ export default function AccountPopover() {
         >
           <DownloadIcon style={{ color: "#3E88DF" }}></DownloadIcon>
         </IconButton>
-      </Tooltip>
+      </Tooltip> */}
 
       <IconButton onClick={handleOpen}>
         <SettingsIcon></SettingsIcon>

src/layouts/dashboard/nav/index.jsx

@@ -154,7 +154,7 @@ export default function Nav({ openNav, onCloseNav }) {
           gap: 1,
         }}
       >
-        <Logo sx={{ width: 60, height: 60 }} />
+        <Logo sx={{ width: 62, height: 42 }} />
         {!ifs && (
           <Typography
             component="b"

src/layouts/login/index.jsx

-import React, { useState } from "react";
-import { Link, Box, Typography, Container } from "@mui/material";
-import { Outlet } from "@umijs/max";
 import Logo from "@/components/logo";
+import { Box, Container, Link, Typography } from "@mui/material";
+import { Outlet } from "@umijs/max";
 import "./index.less";
 
 function LoginLayout() {
   return (
-    <div className="wrap" style={{
-      backgroundImage: "url(./assets/hd.jpg)",
-
-    }}>
+    <div
+      className="wrap"
+      style={{
+        backgroundImage: "url(./assets/hd.jpg)",
+      }}
+    >
       <div className="cover"></div>
       <Container
         component="main"
@@ -20,9 +21,8 @@ function LoginLayout() {
           boxShadow: "0 0 36px #999",
           padding: 0,
           borderRadius: 12,
-          overflow:"hidden",
-          backdropFilter: "blur(4px)"
-
+          overflow: "hidden",
+          backdropFilter: "blur(4px)",
         }}
         borderRadius={2}
       >
@@ -34,11 +34,11 @@ function LoginLayout() {
             alignItems: "center",
             height: 600,
             padding: 6,
-            backgroundColor:"rgba(255,255,255,0.8)",
+            backgroundColor: "rgba(255,255,255,0.8)",
           }}
         >
-          <Logo></Logo>
-          <Typography component="h1" variant="h5" mt={1} mb={1}>
+          <Logo disabledLink={true}></Logo>
+          <Typography component="h1" variant="h5" mt={4} mb={1}>
             精密测量虚拟仿真实训平台
           </Typography>
           <Outlet></Outlet>

src/layouts/simple/SimpleLayout.jsx

-import { Outlet } from '@umijs/max';
-// @mui
-import { styled } from '@mui/material/styles';
-// components
-import Logo from '@/components/logo';
-
-// ----------------------------------------------------------------------
-
-const StyledHeader = styled('header')(({ theme }) => ({
-  top: 0,
-  left: 0,
-  lineHeight: 0,
-  width: '100%',
-  position: 'absolute',
-  padding: theme.spacing(3, 3, 0),
-  [theme.breakpoints.up('sm')]: {
-    padding: theme.spacing(5, 5, 0),
-  },
-}));
-
-// ----------------------------------------------------------------------
-
-export default function SimpleLayout() {
-  return (
-    <>
-      <StyledHeader>
-        <Logo />
-      </StyledHeader>
-
-      <Outlet />
-    </>
-  );
-}

src/layouts/simple/index.jsx

-export { default } from './SimpleLayout';