From 64b6bb2e401a739023dcea3dbfe2113f6cd3bae9 Mon Sep 17 00:00:00 2001 From: jiangxucong Date: Tue, 23 Sep 2025 11:38:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E8=8F=9C=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/nav_system_content/SystemContentList.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/nav_system_content/SystemContentList.js b/src/pages/nav_system_content/SystemContentList.js index 6a6e162..ba2c3ec 100644 --- a/src/pages/nav_system_content/SystemContentList.js +++ b/src/pages/nav_system_content/SystemContentList.js @@ -86,10 +86,10 @@ const SystemContentList = (props) => { const fixedMenuItems = [ { - "path": "/topnavbar00/hrefficiency/timesheet", - icon: 工时仪表盘, - "key": "/topnavbar00/hrefficiency/timesheet", - "label": " 工时仪表盘" + "path": "/topnavbar00/hrefficiency/basicinformation", + icon: 安全管理基础信息, + "key": "/topnavbar00/hrefficiency/basicinformation", + "label": "安全管理基础信息" }, { "path": "/topnavbar00/hrefficiency/staffsheet", From 20974a19bde076192a45adb81f5f38d2230ccf3d Mon Sep 17 00:00:00 2001 From: yupeng Date: Tue, 23 Sep 2025 14:02:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?menu=E6=A0=B7=E5=BC=8F=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/下拉箭头.svg | 3 +++ src/components/GlobalComponent/breadcrumb.less | 3 ++- src/pages/nav_system_content/SystemContentList.js | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 src/assets/img/下拉箭头.svg diff --git a/src/assets/img/下拉箭头.svg b/src/assets/img/下拉箭头.svg new file mode 100644 index 0000000..85c6468 --- /dev/null +++ b/src/assets/img/下拉箭头.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/GlobalComponent/breadcrumb.less b/src/components/GlobalComponent/breadcrumb.less index 8efef5b..5695a96 100644 --- a/src/components/GlobalComponent/breadcrumb.less +++ b/src/components/GlobalComponent/breadcrumb.less @@ -115,6 +115,7 @@ overflow: hidden; text-overflow: ellipsis; width: 100%; + gap: 20px; } // 面包屑项文本样式 @@ -135,7 +136,7 @@ .breadcrumb-close-icon { font-size: 14px; // color: #7D9CD8; - margin-left: 8px; + // margin-left: 8px; display: flex; align-items: center; justify-content: center; diff --git a/src/pages/nav_system_content/SystemContentList.js b/src/pages/nav_system_content/SystemContentList.js index 80ae4f6..9fcbb5f 100644 --- a/src/pages/nav_system_content/SystemContentList.js +++ b/src/pages/nav_system_content/SystemContentList.js @@ -6,7 +6,7 @@ import { formatRoute, getDefaultRoute } from '@/utils/routeUtils' import styles from './TopNavBar.less' import { Row, Col, Avatar, Dropdown, Button } from 'antd' import { userInfo } from '@/utils/globalCommon' -import { HomeOutlined, LogoutOutlined, AppstoreOutlined, UserOutlined, SettingOutlined, DatabaseOutlined, FileTextOutlined, LockOutlined, AreaChartOutlined } from '@ant-design/icons' +import { HomeOutlined, LogoutOutlined, AppstoreOutlined, UserOutlined, SettingOutlined, DatabaseOutlined, FileTextOutlined, LockOutlined, AreaChartOutlined, CaretDownOutlined } from '@ant-design/icons' import { getPageQuery } from '@/utils/utils' import menuTitle from '@/assets/img/智能管控平台.svg' import menuTitle1 from '@/assets/img/智能管控平台-1.svg' @@ -21,6 +21,7 @@ import people from '@/assets/img/people.svg' import risk from '@/assets/img/risk.svg' import { CustomBreadcrumb } from '@/components/GlobalComponent' + // 自定义菜单项渲染组件，支持根据激活状态显示不同图片 const CustomMenuItem = ({ item, selectedKeys }) => { const isActive = selectedKeys.includes(item.key); @@ -241,6 +242,7 @@ const SystemContentList = (props) => { }} popupClassName="custom-select-dropdown" className="custom-select" + suffixIcon={} /> + {/* 菜单收缩按钮 */} + + { return { ...child }; }); - return { ...item, icon, children }; + return { + ...item, + icon, + children, + // 根据菜单收缩状态决定是否显示标签文本 + label: isMenuCollapsed ? null : item.label + }; })} onClick={value => setRouteActive(value)} onOpenChange={value => setOpenKey(value)} - mode='inline' + mode={isMenuCollapsed ? 'vertical' : 'inline'} /> -
+
{/*
*/}
diff --git a/src/pages/nav_system_content/SystemContentList.less b/src/pages/nav_system_content/SystemContentList.less index d630fcf..4019b6c 100644 --- a/src/pages/nav_system_content/SystemContentList.less +++ b/src/pages/nav_system_content/SystemContentList.less @@ -79,7 +79,8 @@ overflow-x: hidden; background-color: #2E4CD4; - .ant-menu-inline { + .ant-menu-inline, + .ant-menu-vertical { background: #2E4CD4 !important; } From ddd1ea4a8b80f6dc8e258a92177b613d6d1b85fa Mon Sep 17 00:00:00 2001 From: yupeng Date: Wed, 24 Sep 2025 09:42:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=96=B0=E5=A2=9E=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/nav_system_content/SystemContentList.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/nav_system_content/SystemContentList.js b/src/pages/nav_system_content/SystemContentList.js index f399272..597d77f 100644 --- a/src/pages/nav_system_content/SystemContentList.js +++ b/src/pages/nav_system_content/SystemContentList.js @@ -6,7 +6,7 @@ import { formatRoute, getDefaultRoute } from '@/utils/routeUtils' import styles from './TopNavBar.less' import { Row, Col, Avatar, Dropdown, Button } from 'antd' import { userInfo } from '@/utils/globalCommon' -import { HomeOutlined, LogoutOutlined, AppstoreOutlined, UserOutlined, SettingOutlined, DatabaseOutlined, FileTextOutlined, LockOutlined, AreaChartOutlined, CaretDownOutlined } from '@ant-design/icons' +import { HomeOutlined, LogoutOutlined, AppstoreOutlined, UserOutlined, SettingOutlined, DatabaseOutlined, FileTextOutlined, LockOutlined, AreaChartOutlined, CaretDownOutlined, BellOutlined, SearchOutlined, QuestionCircleOutlined } from '@ant-design/icons' import { getPageQuery } from '@/utils/utils' import menuTitle from '@/assets/img/智能管控平台.svg' import menuTitle1 from '@/assets/img/智能管控平台-1.svg' @@ -308,7 +308,7 @@ const SystemContentList = (props) => { .menuToggleBtn { position: absolute; right: -15px; - top: 280px; + top: 50%; width: 30px; height: 30px; background: #FDFDFF; @@ -417,6 +417,9 @@ const SystemContentList = (props) => { + + + {userInfo?.user_name_cn ? userInfo.user_name_cn : (userInfo?.user_name || '')}