From a4c7ad2404d2b0bcf173ce26dd8facfed02ec106 Mon Sep 17 00:00:00 2001
From: CODE <1650192445@qq.com>
Date: Wed, 13 Dec 2023 11:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/sider/index.js      |  22 +-
 web/client/src/sections/fillion/nav-item.js   | 224 ++++++++++--------
 2 files changed, 146 insertions(+), 100 deletions(-)

diff --git a/web/client/src/layout/components/sider/index.js b/web/client/src/layout/components/sider/index.js
index b7b80315..3dca78dd 100644
--- a/web/client/src/layout/components/sider/index.js
+++ b/web/client/src/layout/components/sider/index.js
@@ -51,7 +51,7 @@ const Sider = props => {
         });
     }, [items])
 
-
+    console.log(openKeys);
     return (
         <Menu id="sider" mode="inline"
             // theme={themeName || 'dark'}
@@ -62,7 +62,25 @@ const Sider = props => {
                 setSelectedKeys(selectedKeys)
             }}
             onOpenChange={(ks) => {
-                setOpenKeys(ks.length > 1 ? [ks.pop()] : ks)
+                console.log(ks);
+                if (ks.length) {
+                    let nextKs = []
+                    let lastKey = nextKs[nextKs.length - 1]
+                    if (lastKey == 'organization') {
+                        setOpenKeys[lastKey]
+                    } else {
+                        if (ks.length > 2) {
+                            ks.splice(1, ks.length - 2)
+                        }
+                        setOpenKeys(ks)
+                    }
+                    setOpenKeys(
+                        ks.length > 2 ? ks.slice(ks.length - 2) : ks
+                        //  ks.length > 1 ? [ks.pop()] : ks
+                    )
+                } else {
+                    setOpenKeys([])
+                }
             }}
         >
             {items}
diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js
index cd1142da..761d0d82 100644
--- a/web/client/src/sections/fillion/nav-item.js
+++ b/web/client/src/sections/fillion/nav-item.js
@@ -4,117 +4,145 @@ import { Menu } from 'antd';
 import { ReadOutlined } from '@ant-design/icons';
 const SubMenu = Menu.SubMenu;
 export function getNavItem (user, dispatch) {
-   const isshow = user?.userResources?.
-      some(i => i.resourceId === 'OVERLOADMANAGE' ||
-         i.resourceId === 'ROADMANAGE' ||
-         i.resourceId === 'BRIDGEMANAGE' ||
-         i.resourceId === 'MAINTENANCEMANAGE' ||
-         i.resourceId === 'TRANSPORTATIONMANAGE' ||
-         i.resourceId === 'CONSERVATIONMANAGE' ||
-         i.resourceId === 'PUBLICTRANSPORTMANAGE' ||
-         i.resourceId === 'FILEMANAGE' ||
-         i.resourceId === 'PUBLICITYVIDEO' ||
-         i.resourceId === 'FEEDBACKMANAGE' ||
-         i.resourceId === 'REPORTMANAGE' ||
-         i.resourceId === 'PATROLMANAGE' ||
-         i.resourceId === 'ASSESSMANAGE' ||
-         i.resourceId === 'VIDEOCENTER' ||
-         i.resourceId === 'BUILDINGPROJECT' ||
-         i.resourceId === 'MAINTENANCESPOTCHECK' ||
-         i.resourceId === 'LUZHENG' ||
-         i.resourceId === 'ADJUSTLOG'
-      )
+    const isshow = user?.userResources?.
+        some(i => i.resourceId === 'OVERLOADMANAGE' ||
+            i.resourceId === 'ROADMANAGE' ||
+            i.resourceId === 'BRIDGEMANAGE' ||
+            i.resourceId === 'MAINTENANCEMANAGE' ||
+            i.resourceId === 'TRANSPORTATIONMANAGE' ||
+            i.resourceId === 'CONSERVATIONMANAGE' ||
+            i.resourceId === 'PUBLICTRANSPORTMANAGE' ||
+            i.resourceId === 'FILEMANAGE' ||
+            i.resourceId === 'PUBLICITYVIDEO' ||
+            i.resourceId === 'FEEDBACKMANAGE' ||
+            i.resourceId === 'REPORTMANAGE' ||
+            i.resourceId === 'PATROLMANAGE' ||
+            i.resourceId === 'ASSESSMANAGE' ||
+            i.resourceId === 'VIDEOCENTER' ||
+            i.resourceId === 'BUILDINGPROJECT' ||
+            i.resourceId === 'MAINTENANCESPOTCHECK' ||
+            i.resourceId === 'LUZHENG' ||
+            i.resourceId === 'ADJUSTLOG'
+        )
 
-   return (
-      user?.username == 'SuperAdmin' || isshow ?
-         <SubMenu key="fillion" icon={<ReadOutlined />} title={'数据管理'}>
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ?
+    return (
+        user?.username == 'SuperAdmin' || isshow ?
+            <SubMenu key="fillion" icon={<ReadOutlined />} title={'数据管理'}>
+                {
+                    user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'REPORTMANAGE' || i.resourceId === 'BUILDINGPROJECT' || i.resourceId === 'FILEMANAGE') ?
+                        <SubMenu key="build" title={'建设'}>
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'REPORTMANAGE') ?
+                                <Menu.Item key="fillionpatrolroad">
+                                    <Link to="/fillion/patrol_road">建设上报</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'BUILDINGPROJECT') ?
+                                <Menu.Item key="fillionbuilding">
+                                    <Link to="/fillion/processsing">在建项目</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'FILEMANAGE') ?
+                                <Menu.Item key="fileCont">
+                                    <Link to="/fillion/file">档案管理</Link>
+                                </Menu.Item> : ''}
+                        </SubMenu>
+                        : ''
+                }
+
+                {
+                    user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'VIDEOCENTER' || i.resourceId === 'LUZHENG' || i.resourceId === 'ROADMANAGE' || i.resourceId === 'BRIDGEMANAGE') ?
+                        <SubMenu key="manage" title={'管理'}>
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'VIDEOCENTER') ?
+                                <Menu.Item key="fillionvideoCenter">
+                                    <Link to="/fillion/videoCenter">视频中心</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'LUZHENG') ?
+                                <Menu.Item key="luzheng">
+                                    <Link to="/fillion/luzheng">路政管理</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'ROADMANAGE') ?
+                                <Menu.Item key="filliontransportation">
+                                    <Link to="/fillion/transportation">道路管理</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'BRIDGEMANAGE') ?
+                                <Menu.Item key="fillionbridge">
+                                    <Link to="/fillion/bridge">桥梁管理</Link>
+                                </Menu.Item> : ''}
+                        </SubMenu>
+                        : ''
+                }
+
+                {
+                    user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'MAINTENANCEMANAGE' || i.resourceId === 'PATROLMANAGE' || i.resourceId === 'FEEDBACKMANAGE' || i.resourceId === 'CONSERVATIONMANAGE' || i.resourceId === 'MAINTENANCESPOTCHECK' || i.resourceId === 'ADJUSTLOG' || i.resourceId === 'ASSESSMANAGE') ?
+                        <SubMenu key="conserve" title={'养护'}>
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'MAINTENANCEMANAGE') ?
+                                <Menu.Item key="fillionhighways">
+                                    <Link to="/fillion/highways">管养管理</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'PATROLMANAGE') ?
+                                <Menu.Item key="fillionpatrol">
+                                    <Link to="/fillion/patrol">巡查管理</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'FEEDBACKMANAGE') ?
+                                <Menu.Item key="fillionpatrolanomaly">
+                                    <Link to="/fillion/patrol_anomaly">异常反馈</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'CONSERVATIONMANAGE') ?
+                                <Menu.Item key="fillionmaintenance">
+                                    <Link to="/fillion/maintenance">养护管理</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'MAINTENANCESPOTCHECK') ?
+                                <Menu.Item key="maintenanceSpotCheck">
+                                    <Link to="/fillion/maintenanceSpotCheck">养护抽查</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'ADJUSTLOG') ?
+                                <Menu.Item key="adjustLog">
+                                    <Link to="/fillion/adjustLog">调整日志</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'ASSESSMANAGE') ?
+                                <Menu.Item key="fillionassess">
+                                    <Link to="/fillion/assess">考核评分</Link>
+                                </Menu.Item> : ''}
+                        </SubMenu>
+                        : ''
+                }
+
+                {
+                    user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'TRANSPORTATIONMANAGE' || i.resourceId === 'PUBLICTRANSPORTMANAGE') ?
+                        <SubMenu key="operation" title={'运营'}>
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'TRANSPORTATIONMANAGE') ?
+                                <Menu.Item key="fillionoperational">
+                                    <Link to="/fillion/operational">运政管理</Link>
+                                </Menu.Item> : ''}
+                            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'PUBLICTRANSPORTMANAGE') ?
+                                <Menu.Item key="fillionpublic">
+                                    <Link to="/fillion/public">公交管理</Link>
+                                </Menu.Item> : ''}
+                        </SubMenu>
+                        : ''
+                }
+
+                {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'OVERLOADMANAGE') ?
                     <Menu.Item key="fillioninfor">
                         <Link to="/fillion/infor">治超管理</Link>
                     </Menu.Item> : ''}
-            {/* <Menu.Item key="filliontask">
+                {/* <Menu.Item key="filliontask">
                     <Link to="/fillion/task">任务管理</Link>
                 </Menu.Item> */}
 
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'LUZHENG') ?
-               <Menu.Item key="luzheng">
-                  <Link to="/fillion/luzheng">路政管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'ROADMANAGE') ?
-               <Menu.Item key="filliontransportation">
-                  <Link to="/fillion/transportation">道路管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'BRIDGEMANAGE') ?
-               <Menu.Item key="fillionbridge">
-                  <Link to="/fillion/bridge">桥梁管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'MAINTENANCEMANAGE') ?
-               <Menu.Item key="fillionhighways">
-                  <Link to="/fillion/highways">管养管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'TRANSPORTATIONMANAGE') ?
-               <Menu.Item key="fillionoperational">
-                  <Link to="/fillion/operational">运政管理</Link>
-               </Menu.Item> : ''}
-            {/* <Menu.Item key="fillionenforce">
+                {/* <Menu.Item key="fillionenforce">
                 <Link to="/fillion/enforce">执法管理</Link>
             </Menu.Item> */}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'CONSERVATIONMANAGE') ?
-               <Menu.Item key="fillionmaintenance">
-                  <Link to="/fillion/maintenance">养护管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'PATROLMANAGE') ?
-               <Menu.Item key="fillionpatrol">
-                  <Link to="/fillion/patrol">巡查管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'FEEDBACKMANAGE') ?
-               <Menu.Item key="fillionpatrolanomaly">
-                  <Link to="/fillion/patrol_anomaly">异常反馈</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'REPORTMANAGE') ?
 
-               <Menu.Item key="fillionpatrolroad">
-                  <Link to="/fillion/patrol_road">建设上报</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'BUILDINGPROJECT') ?
-               <Menu.Item key="fillionbuilding">
-                  <Link to="/fillion/processsing">在建项目</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'PUBLICTRANSPORTMANAGE') ?
-               <Menu.Item key="fillionpublic">
-                  <Link to="/fillion/public">公交管理</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'FILEMANAGE') ?
-               <Menu.Item key="fileCont">
-                  <Link to="/fillion/file">档案管理</Link>
-               </Menu.Item> : ''}
-            {/* <Menu.Item key="fillionvideois">
+                {/* <Menu.Item key="fillionvideois">
                 <Link to="/fillion/videois">视频管理</Link>
             </Menu.Item> */}
-            {/* <Menu.Item key="jiekouguanli">
+                {/* <Menu.Item key="jiekouguanli">
                 <Link to="/fillion/jiekouguanli">接口管理</Link>
             </Menu.Item> */}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'PUBLICITYVIDEO') ?
-               <Menu.Item key="fillionpromotional">
-                  <Link to="/fillion/promotional">宣传视频</Link>
-               </Menu.Item> : ''}
 
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'ASSESSMANAGE') ?
-               <Menu.Item key="fillionassess">
-                  <Link to="/fillion/assess">考核评分</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'VIDEOCENTER') ?
-               <Menu.Item key="fillionvideoCenter">
-                  <Link to="/fillion/videoCenter">视频中心</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'MAINTENANCESPOTCHECK') ?
-               <Menu.Item key="maintenanceSpotCheck">
-                  <Link to="/fillion/maintenanceSpotCheck">养护抽查</Link>
-               </Menu.Item> : ''}
-            {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'ADJUSTLOG') ?
-               <Menu.Item key="adjustLog">
-                  <Link to="/fillion/adjustLog">调整日志</Link>
-               </Menu.Item> : ''}
-         </SubMenu> : null
-   );
+                {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'PUBLICITYVIDEO') ?
+                    <Menu.Item key="fillionpromotional">
+                        <Link to="/fillion/promotional">宣传视频</Link>
+                    </Menu.Item> : ''}
+            </SubMenu> : null
+    );
 }