diff --git a/config/routes.js b/config/routes.js index 00d0f07..98340aa 100644 --- a/config/routes.js +++ b/config/routes.js @@ -35,7 +35,7 @@ export default [ path: '/topnavbar00/hrefficiency/staffsheet', // icon: 'bank', name: 'staffsheet', - component: './hrefficiency_staffsheet/StaffSheetList', + component: './safe_majorHazard/SafeMajorHazardList', }, { path: '/topnavbar00/hrefficiency/staffuph', 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 ba2c3ec..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 } 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' @@ -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); @@ -63,6 +64,7 @@ const SystemContentList = (props) => { const [selectedKey, setSelectedKey] = useState([]) const [menuItems, setMenuItems] = useState([]) const [systemType, setSystemType] = useState('安全管理系统') + const [isMenuCollapsed, setIsMenuCollapsed] = useState(false); // 添加菜单收缩状态 let defaultKey = '' useEffect(() => { @@ -95,7 +97,7 @@ const SystemContentList = (props) => { "path": "/topnavbar00/hrefficiency/staffsheet", icon: 工时仪表盘, "key": "/topnavbar00/hrefficiency/staffsheet", - "label": "员工仪表盘" + "label": "重大危险源管理" }, { "path": "/topnavbar00/hrefficiency/staffuph", @@ -169,6 +171,11 @@ const SystemContentList = (props) => { history.replace(curKey) } + // 切换菜单收缩状态 + const toggleMenu = () => { + setIsMenuCollapsed(!isMenuCollapsed); + }; + const { initialState: { menu }, setInitialState } = useModel('@@initialState') const loginOut = async () => { @@ -212,12 +219,27 @@ const SystemContentList = (props) => { return (
-
-
+
+
menuTitle menuTitle1
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + {/**/} + {/* */} + {/* */} + {/* */} + {/**/} + + + + + + */} + + + + + + + + + + + + + + + + + + + + + + + +